RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2024-12-11 21:56:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[DebugInfo] Accept enumeration types without underlying integer type present in

Browse Source 
debug info metadata

... when generating DWARF.

Differential Revision: https://reviews.llvm.org/D43304


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@325234 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Momchil Velikov 2018-02-15 13:29:33 +00:00
parent 371e6cc130
commit 032b42a4b9
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/CodeGen/AsmPrinter/DwarfUnit.cpp
View File

@ -1430,11 +1430,11 @@ void DwarfUnit::constructArrayTypeDIE(DIE &Buffer, const DICompositeType *CTy) {
void DwarfUnit::constructEnumTypeDIE(DIE &Buffer, const DICompositeType *CTy) { void DwarfUnit::constructEnumTypeDIE(DIE &Buffer, const DICompositeType *CTy) {
const DIType *DTy = resolve(CTy->getBaseType()); const DIType *DTy = resolve(CTy->getBaseType());
bool IsUnsigned = DTy && isUnsignedDIType(DD, DTy); bool IsUnsigned = DTy && isUnsignedDIType(DD, DTy);
if (DTy && DD->getDwarfVersion() >= 3) if (DTy) {
addType(Buffer, DTy); if (DD->getDwarfVersion() >= 3)
if (DD->getDwarfVersion() >= 4 && (CTy->getFlags() & DINode::FlagFixedEnum)) { addType(Buffer, DTy);
assert(DTy); if (DD->getDwarfVersion() >= 4 && (CTy->getFlags() & DINode::FlagFixedEnum))
addFlag(Buffer, dwarf::DW_AT_enum_class); addFlag(Buffer, dwarf::DW_AT_enum_class);
} }
DINodeArray Elements = CTy->getElements(); DINodeArray Elements = CTy->getElements();

17
test/DebugInfo/Generic/debug-info-enum.ll
View File

@ -162,13 +162,26 @@
!42 = !{!43, !44} !42 = !{!43, !44}
!43 = !DIEnumerator(name: "A8", value: -128) !43 = !DIEnumerator(name: "A8", value: -128)
!44 = !DIEnumerator(name: "B8", value: 127) !44 = !DIEnumerator(name: "B8", value: 127)
!45 = !{!0, !46, !48, !50, !52, !54, !56, !58, !60}
; CHECK: DW_TAG_enumeration_type ; CHECK: DW_TAG_enumeration_type
; CHECK-DW2-NOT: DW_AT_type ; CHECK-DW2-NOT: DW_AT_type
; CHECK-DW4: DW_AT_type{{.*}}"int" ; CHECK-DW4: DW_AT_type{{.*}}"int"
; CHECK-NOT: DW_AT_enum_class ; CHECK-NOT: DW_AT_enum_class
; CHECK: DW_AT_name ("E8") ; CHECK: DW_AT_name ("E8")
; Test enumeration without a fixed underlying type, but with the DIFlagFixedEnum
; set. The DW_AT_enum_class attribute should be absent. This behaviour is
; intented to keep compatibilty with existing DWARF consumers, which may imply
; the type is present whenever DW_AT_enum_class is set.
!63 = !DICompositeType(tag: DW_TAG_enumeration_type, name: "E9", file: !3, line: 63, size: 32, flags: DIFlagFixedEnum, elements: !64, identifier: "_ZTS2E9")
!64 = !{!65, !66}
!65 = !DIEnumerator(name: "A9", value: -128)
!66 = !DIEnumerator(name: "B9", value: 127)
; CHECK: DW_TAG_enumeration_type
; CHECK-NOT: DW_AT_type
; CHECK-NOT: DW_AT_enum_class
; CHECK: DW_AT_name ("E9")
!45 = !{!0, !46, !48, !50, !52, !54, !56, !58, !60, !67}
!46 = !DIGlobalVariableExpression(var: !47, expr: !DIExpression()) !46 = !DIGlobalVariableExpression(var: !47, expr: !DIExpression())
!47 = distinct !DIGlobalVariable(name: "x1", scope: !2, file: !3, line: 12, type: !10, isLocal: false, isDefinition: true) !47 = distinct !DIGlobalVariable(name: "x1", scope: !2, file: !3, line: 12, type: !10, isLocal: false, isDefinition: true)
!48 = !DIGlobalVariableExpression(var: !49, expr: !DIExpression()) !48 = !DIGlobalVariableExpression(var: !49, expr: !DIExpression())
@ -185,4 +198,6 @@
!59 = distinct !DIGlobalVariable(name: "x7", scope: !2, file: !3, line: 57, type: !37, isLocal: false, isDefinition: true) !59 = distinct !DIGlobalVariable(name: "x7", scope: !2, file: !3, line: 57, type: !37, isLocal: false, isDefinition: true)
!60 = !DIGlobalVariableExpression(var: !61, expr: !DIExpression()) !60 = !DIGlobalVariableExpression(var: !61, expr: !DIExpression())
!61 = distinct !DIGlobalVariable(name: "x8", scope: !2, file: !3, line: 63, type: !41, isLocal: false, isDefinition: true) !61 = distinct !DIGlobalVariable(name: "x8", scope: !2, file: !3, line: 63, type: !41, isLocal: false, isDefinition: true)
!67 = !DIGlobalVariableExpression(var: !68, expr: !DIExpression())
!68 = distinct !DIGlobalVariable(name: "x9", scope: !2, file: !3, line: 63, type: !63, isLocal: false, isDefinition: true)
!62 = !{i32 2, !"Debug Info Version", i32 3} !62 = !{i32 2, !"Debug Info Version", i32 3}