From 87387c403b47ad052249bb7e7068123067d1b6e9 Mon Sep 17 00:00:00 2001 From: Jake Egan Date: Tue, 1 Feb 2022 11:17:35 -0500 Subject: [PATCH] [AIX] Bump DWARF versions to 3 because XCOFF64 requires DWARF64 DWARF64 was implemented at version 3, so if a DWARF version less than 3 is specified, DWARF64 does not get selected. Since XCOFF64 requires DWARF64, the modified tests fail on 64-bit AIX. This patch bumps these tests to dwarf version 3 to maintain test coverage on 64-bit AIX. Reviewed By: dblaikie Differential Revision: https://reviews.llvm.org/D114110 --- llvm/test/DebugInfo/Generic/enum-types.ll | 2 +- llvm/test/DebugInfo/Generic/namespace.ll | 2 +- llvm/test/DebugInfo/Generic/tu-composite.ll | 2 +- llvm/test/DebugInfo/Generic/tu-member-pointer.ll | 2 +- llvm/test/DebugInfo/Generic/varargs.ll | 2 +- llvm/test/Linker/Inputs/type-unique-simple2-a.ll | 2 +- llvm/test/Linker/Inputs/type-unique-simple2-b.ll | 2 +- llvm/test/Linker/type-unique-simple-a.ll | 2 +- llvm/test/Linker/type-unique-simple-b.ll | 2 +- llvm/test/Linker/type-unique-simple2-a.ll | 2 +- llvm/test/Linker/type-unique-simple2-b.ll | 2 +- llvm/test/Linker/type-unique-type-array-a.ll | 2 +- llvm/test/Linker/type-unique-type-array-b.ll | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/llvm/test/DebugInfo/Generic/enum-types.ll b/llvm/test/DebugInfo/Generic/enum-types.ll index 786ee28f54acb..cfdfea9270a9f 100644 --- a/llvm/test/DebugInfo/Generic/enum-types.ll +++ b/llvm/test/DebugInfo/Generic/enum-types.ll @@ -64,7 +64,7 @@ attributes #1 = { nounwind readnone } !15 = !DICompositeType(tag: DW_TAG_enumeration_type, name: "EA", line: 1, size: 32, align: 32, file: !13, elements: !4, identifier: "_ZTS2EA") !17 = distinct !DISubprogram(name: "topB", linkageName: "_Z4topB2EA", line: 5, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !12, scopeLine: 5, file: !13, scope: !18, type: !9, retainedNodes: !11) !18 = !DIFile(filename: "b.cpp", directory: "") -!19 = !{i32 2, !"Dwarf Version", i32 2} +!19 = !{i32 2, !"Dwarf Version", i32 3} !20 = !{i32 2, !"Debug Info Version", i32 3} !21 = !{!"clang version 3.5.0 (trunk 214102:214133) (llvm/trunk 214102:214132)"} !22 = !DILocalVariable(name: "sa", line: 5, arg: 1, scope: !7, file: !8, type: !3) diff --git a/llvm/test/DebugInfo/Generic/namespace.ll b/llvm/test/DebugInfo/Generic/namespace.ll index 2c635ee5731a6..2fe6b393fe6e6 100644 --- a/llvm/test/DebugInfo/Generic/namespace.ll +++ b/llvm/test/DebugInfo/Generic/namespace.ll @@ -329,7 +329,7 @@ attributes #1 = { nounwind readnone } !54 = !DIImportedEntity(tag: DW_TAG_imported_declaration, file: !5, line: 36, scope: !21, entity: !32) !55 = !DIImportedEntity(tag: DW_TAG_imported_declaration, file: !5, line: 37, scope: !21, entity: !26) !56 = !DIImportedEntity(tag: DW_TAG_imported_declaration, file: !5, line: 42, scope: !7, entity: !31) -!57 = !{i32 2, !"Dwarf Version", i32 2} +!57 = !{i32 2, !"Dwarf Version", i32 3} !58 = !{i32 2, !"Debug Info Version", i32 3} !59 = !{!"clang version 3.6.0 "} !60 = !DILocation(line: 3, column: 12, scope: !10) diff --git a/llvm/test/DebugInfo/Generic/tu-composite.ll b/llvm/test/DebugInfo/Generic/tu-composite.ll index 2caa35824385b..a95b9460d67de 100644 --- a/llvm/test/DebugInfo/Generic/tu-composite.ll +++ b/llvm/test/DebugInfo/Generic/tu-composite.ll @@ -154,7 +154,7 @@ attributes #1 = { nounwind readnone } !32 = distinct !DISubprogram(name: "test", linkageName: "_Z4testv", line: 20, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 20, file: !1, scope: !7, type: !33, retainedNodes: !2) !33 = !DISubroutineType(types: !34) !34 = !{null} -!35 = !{i32 2, !"Dwarf Version", i32 2} +!35 = !{i32 2, !"Dwarf Version", i32 3} !36 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !31, type: !37) !37 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !4) !38 = !DILocation(line: 0, scope: !31) diff --git a/llvm/test/DebugInfo/Generic/tu-member-pointer.ll b/llvm/test/DebugInfo/Generic/tu-member-pointer.ll index 449bb5e101fff..b8e8966663f08 100644 --- a/llvm/test/DebugInfo/Generic/tu-member-pointer.ll +++ b/llvm/test/DebugInfo/Generic/tu-member-pointer.ll @@ -26,6 +26,6 @@ source_filename = "test/DebugInfo/Generic/tu-member-pointer.ll" !7 = !{} !8 = !{!5} !9 = !{!0} -!10 = !{i32 2, !"Dwarf Version", i32 2} +!10 = !{i32 2, !"Dwarf Version", i32 3} !11 = !{i32 1, !"Debug Info Version", i32 3} diff --git a/llvm/test/DebugInfo/Generic/varargs.ll b/llvm/test/DebugInfo/Generic/varargs.ll index 81b5091afd427..7764ed64a7082 100644 --- a/llvm/test/DebugInfo/Generic/varargs.ll +++ b/llvm/test/DebugInfo/Generic/varargs.ll @@ -86,7 +86,7 @@ attributes #1 = { nounwind readnone } !15 = !DIFile(filename: "llvm/tools/clang/test/CodeGenCXX/debug-info-varargs.cpp", directory: "radar/13690847") !16 = !DISubroutineType(types: !17) !17 = !{null, !10, null} -!18 = !{i32 2, !"Dwarf Version", i32 2} +!18 = !{i32 2, !"Dwarf Version", i32 3} !19 = !{i32 1, !"Debug Info Version", i32 3} !20 = !{!"clang version 3.5 "} !21 = !DILocalVariable(name: "c", line: 13, arg: 1, scope: !14, file: !15, type: !10) diff --git a/llvm/test/Linker/Inputs/type-unique-simple2-a.ll b/llvm/test/Linker/Inputs/type-unique-simple2-a.ll index 05f212e86a7d8..5cac92a60876e 100644 --- a/llvm/test/Linker/Inputs/type-unique-simple2-a.ll +++ b/llvm/test/Linker/Inputs/type-unique-simple2-a.ll @@ -78,7 +78,7 @@ attributes #1 = { nounwind readnone } !13 = !DIFile(filename: "foo.cpp", directory: ".") !14 = !DISubroutineType(types: !15) !15 = !{null, !8} -!16 = !{i32 2, !"Dwarf Version", i32 2} +!16 = !{i32 2, !"Dwarf Version", i32 3} !17 = !DILocalVariable(name: "a", line: 3, arg: 1, scope: !12, file: !13, type: !8) !18 = !DILocation(line: 3, scope: !12) !19 = !DILocalVariable(name: "t", line: 4, scope: !12, file: !13, type: !4) diff --git a/llvm/test/Linker/Inputs/type-unique-simple2-b.ll b/llvm/test/Linker/Inputs/type-unique-simple2-b.ll index 0e8b46c06bf2a..8fd993b1c2b98 100644 --- a/llvm/test/Linker/Inputs/type-unique-simple2-b.ll +++ b/llvm/test/Linker/Inputs/type-unique-simple2-b.ll @@ -54,7 +54,7 @@ attributes #3 = { "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp !16 = distinct !DISubprogram(name: "main", line: 7, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 7, file: !1, scope: !13, type: !17, retainedNodes: !2) !17 = !DISubroutineType(types: !18) !18 = !{!8} -!19 = !{i32 2, !"Dwarf Version", i32 2} +!19 = !{i32 2, !"Dwarf Version", i32 3} !20 = !DILocalVariable(name: "a", line: 4, arg: 1, scope: !12, file: !13, type: !8) !21 = !DILocation(line: 4, scope: !12) !22 = !DILocalVariable(name: "t", line: 5, scope: !12, file: !13, type: !4) diff --git a/llvm/test/Linker/type-unique-simple-a.ll b/llvm/test/Linker/type-unique-simple-a.ll index 533163d1f2764..99f62fc92a973 100644 --- a/llvm/test/Linker/type-unique-simple-a.ll +++ b/llvm/test/Linker/type-unique-simple-a.ll @@ -81,7 +81,7 @@ attributes #1 = { nounwind readnone } !11 = !DIFile(filename: "foo.cpp", directory: "/Users/mren/c_testing/type_unique_air/simple") !12 = !DISubroutineType(types: !13) !13 = !{null, !8} -!14 = !{i32 2, !"Dwarf Version", i32 2} +!14 = !{i32 2, !"Dwarf Version", i32 3} !15 = !DILocalVariable(name: "a", line: 3, arg: 1, scope: !10, file: !11, type: !8) !16 = !DILocation(line: 3, scope: !10) !17 = !DILocalVariable(name: "t", line: 4, scope: !10, file: !11, type: !4) diff --git a/llvm/test/Linker/type-unique-simple-b.ll b/llvm/test/Linker/type-unique-simple-b.ll index 217084e17c606..ddef8f365bbfa 100644 --- a/llvm/test/Linker/type-unique-simple-b.ll +++ b/llvm/test/Linker/type-unique-simple-b.ll @@ -54,7 +54,7 @@ attributes #3 = { "less-precise-fpmad"="false" "frame-pointer"="all" "no-infs-fp !14 = distinct !DISubprogram(name: "main", line: 7, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 7, file: !1, scope: !11, type: !15, retainedNodes: !2) !15 = !DISubroutineType(types: !16) !16 = !{!8} -!17 = !{i32 2, !"Dwarf Version", i32 2} +!17 = !{i32 2, !"Dwarf Version", i32 3} !18 = !DILocalVariable(name: "a", line: 4, arg: 1, scope: !10, file: !11, type: !8) !19 = !DILocation(line: 4, scope: !10) !20 = !DILocalVariable(name: "t", line: 5, scope: !10, file: !11, type: !4) diff --git a/llvm/test/Linker/type-unique-simple2-a.ll b/llvm/test/Linker/type-unique-simple2-a.ll index 05d9f6c0ef5e0..c787e35de5c12 100644 --- a/llvm/test/Linker/type-unique-simple2-a.ll +++ b/llvm/test/Linker/type-unique-simple2-a.ll @@ -112,7 +112,7 @@ attributes #4 = { nounwind readnone } !31 = distinct !DISubprogram(name: "A", linkageName: "_ZN1AC1Ev", line: 2, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagArtificial | DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 2, file: !5, scope: !4, type: !15, declaration: !32, retainedNodes: !2) !32 = !DISubprogram(name: "A", isLocal: false, isDefinition: false, virtualIndex: 6, flags: DIFlagArtificial | DIFlagPrototyped, isOptimized: false, scope: !4, type: !15) !34 = distinct !DISubprogram(name: "A", linkageName: "_ZN1AC2Ev", line: 2, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagArtificial | DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 2, file: !5, scope: !4, type: !15, declaration: !32, retainedNodes: !2) -!35 = !{i32 2, !"Dwarf Version", i32 2} +!35 = !{i32 2, !"Dwarf Version", i32 3} !36 = !{i32 1, !"Debug Info Version", i32 3} !37 = !{!"clang version 3.5 "} !38 = !DILocation(line: 3, scope: !27) diff --git a/llvm/test/Linker/type-unique-simple2-b.ll b/llvm/test/Linker/type-unique-simple2-b.ll index 0e4df5fdf4d63..7c3788d0497d9 100644 --- a/llvm/test/Linker/type-unique-simple2-b.ll +++ b/llvm/test/Linker/type-unique-simple2-b.ll @@ -73,7 +73,7 @@ attributes #1 = { nounwind readnone } !26 = distinct !DISubprogram(name: "setFoo", linkageName: "_ZN1A6setFooEv", line: 2, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPublic | DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 2, file: !27, scope: !4, type: !15, declaration: !14, retainedNodes: !2) !27 = !DIFile(filename: "b.cpp", directory: "") !28 = distinct !DISubprogram(name: "getFoo", linkageName: "_ZN1A6getFooEv", line: 4, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPublic | DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 4, file: !27, scope: !4, type: !20, declaration: !19, retainedNodes: !2) -!29 = !{i32 2, !"Dwarf Version", i32 2} +!29 = !{i32 2, !"Dwarf Version", i32 3} !30 = !{i32 1, !"Debug Info Version", i32 3} !31 = !{!"clang version 3.5 "} !32 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !26, type: !33) diff --git a/llvm/test/Linker/type-unique-type-array-a.ll b/llvm/test/Linker/type-unique-type-array-a.ll index 91aa30372996f..c09fd776d609d 100644 --- a/llvm/test/Linker/type-unique-type-array-a.ll +++ b/llvm/test/Linker/type-unique-type-array-a.ll @@ -112,7 +112,7 @@ attributes #3 = { nounwind } !18 = !{null, !19, !10} !19 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !4) !20 = distinct !DISubprogram(name: "testA", linkageName: "_ZN1A5testAE2SA", line: 7, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 7, file: !1, scope: !4, type: !7, declaration: !6, retainedNodes: !2) -!21 = !{i32 2, !"Dwarf Version", i32 2} +!21 = !{i32 2, !"Dwarf Version", i32 3} !22 = !{i32 2, !"Debug Info Version", i32 3} !23 = !{!"clang version 3.5.0 (trunk 214102:214113M) (llvm/trunk 214102:214115M)"} !24 = !DILocalVariable(name: "a", line: 11, arg: 1, scope: !15, file: !16, type: !19) diff --git a/llvm/test/Linker/type-unique-type-array-b.ll b/llvm/test/Linker/type-unique-type-array-b.ll index 82084fcf6585c..6a29a8e751ff1 100644 --- a/llvm/test/Linker/type-unique-type-array-b.ll +++ b/llvm/test/Linker/type-unique-type-array-b.ll @@ -91,7 +91,7 @@ attributes #3 = { nounwind } !18 = !{null, !19, !10} !19 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !4) !20 = distinct !DISubprogram(name: "testB", linkageName: "_ZN1B5testBE2SA", line: 7, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !0, scopeLine: 7, file: !1, scope: !4, type: !7, declaration: !6, retainedNodes: !2) -!21 = !{i32 2, !"Dwarf Version", i32 2} +!21 = !{i32 2, !"Dwarf Version", i32 3} !22 = !{i32 2, !"Debug Info Version", i32 3} !23 = !{!"clang version 3.5.0 (trunk 214102:214113M) (llvm/trunk 214102:214115M)"} !24 = !DILocalVariable(name: "b", line: 11, arg: 1, scope: !15, file: !16, type: !19)