diff options
Diffstat (limited to 'llvm/test/DebugInfo')
149 files changed, 394 insertions, 394 deletions
diff --git a/llvm/test/DebugInfo/2009-11-10-CurrentFn.ll b/llvm/test/DebugInfo/2009-11-10-CurrentFn.ll index 228edec93c4..599cef25423 100644 --- a/llvm/test/DebugInfo/2009-11-10-CurrentFn.ll +++ b/llvm/test/DebugInfo/2009-11-10-CurrentFn.ll @@ -21,7 +21,7 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !7 = !DISubroutineType(types: !8) !8 = !{null} !9 = !{!11} -!11 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "i", line: 3, arg: 1, scope: !5, file: !17, type: !12) +!11 = !DILocalVariable(name: "i", line: 3, arg: 1, scope: !5, file: !17, type: !12) !12 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !13 = !DILocation(line: 3, column: 14, scope: !5) !14 = !DILocation(line: 4, column: 3, scope: !15) diff --git a/llvm/test/DebugInfo/2010-03-12-llc-crash.ll b/llvm/test/DebugInfo/2010-03-12-llc-crash.ll index fcca6c52170..1c47a92cc37 100644 --- a/llvm/test/DebugInfo/2010-03-12-llc-crash.ll +++ b/llvm/test/DebugInfo/2010-03-12-llc-crash.ll @@ -9,7 +9,7 @@ entry: ret void } -!0 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "sy", line: 890, arg: 1, scope: !1, file: !2, type: !7) +!0 = !DILocalVariable(name: "sy", line: 890, arg: 1, scope: !1, file: !2, type: !7) !1 = !DISubprogram(name: "foo", linkageName: "foo", line: 892, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, file: !8, scope: !3, type: !4) !2 = !DIFile(filename: "qpainter.h", directory: "QtGui") !3 = !DICompileUnit(language: DW_LANG_C_plus_plus, producer: "clang 1.1", isOptimized: true, emissionKind: 0, file: !9, enums: !10, retainedTypes: !10) diff --git a/llvm/test/DebugInfo/2010-03-19-DbgDeclare.ll b/llvm/test/DebugInfo/2010-03-19-DbgDeclare.ll index 40d96e1d443..bf448b4a1a7 100644 --- a/llvm/test/DebugInfo/2010-03-19-DbgDeclare.ll +++ b/llvm/test/DebugInfo/2010-03-19-DbgDeclare.ll @@ -12,7 +12,7 @@ entry: !2 = !DICompileUnit(language: DW_LANG_Mips_Assembler, producer: "clang version 3.3 ", isOptimized: false, emissionKind: 1, file: !4, enums: !3, retainedTypes: !3, subprograms: !3, globals: !3, imports: !3) !3 = !{} !0 = !DILocation(line: 662302, column: 26, scope: !1) -!1 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "foo", scope: !6) +!1 = !DILocalVariable(name: "foo", scope: !6) !4 = !DIFile(filename: "scratch.cpp", directory: "/usr/local/google/home/blaikie/dev/scratch") !6 = !DISubprogram() diff --git a/llvm/test/DebugInfo/2010-03-24-MemberFn.ll b/llvm/test/DebugInfo/2010-03-24-MemberFn.ll index 83ff5f97805..81c73e5f430 100644 --- a/llvm/test/DebugInfo/2010-03-24-MemberFn.ll +++ b/llvm/test/DebugInfo/2010-03-24-MemberFn.ll @@ -39,7 +39,7 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !llvm.dbg.cu = !{!5} !llvm.module.flags = !{!28} -!0 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "s1", line: 3, scope: !1, file: !4, type: !9) +!0 = !DILocalVariable(name: "s1", line: 3, scope: !1, file: !4, type: !9) !1 = distinct !DILexicalBlock(line: 3, column: 0, file: !25, scope: !2) !2 = distinct !DILexicalBlock(line: 3, column: 0, file: !25, scope: !3) !3 = !DISubprogram(name: "bar", linkageName: "_Z3barv", line: 3, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, scopeLine: 3, file: !25, scope: !4, type: !6, function: i32 ()* @_Z3barv) @@ -57,7 +57,7 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !15 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, flags: DIFlagArtificial, file: !25, scope: !4, baseType: !9) !16 = !DILocation(line: 3, scope: !1) !17 = !DILocation(line: 3, scope: !3) -!18 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 3, arg: 1, scope: !12, file: !10, type: !19) +!18 = !DILocalVariable(name: "this", line: 3, arg: 1, scope: !12, file: !10, type: !19) !19 = !DIDerivedType(tag: DW_TAG_const_type, size: 64, align: 64, flags: DIFlagArtificial, file: !25, scope: !4, baseType: !20) !20 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, file: !25, scope: !4, baseType: !9) !21 = !DILocation(line: 3, scope: !12) diff --git a/llvm/test/DebugInfo/2010-04-06-NestedFnDbgInfo.ll b/llvm/test/DebugInfo/2010-04-06-NestedFnDbgInfo.ll index 68fd0a93eac..23ef7d3afeb 100644 --- a/llvm/test/DebugInfo/2010-04-06-NestedFnDbgInfo.ll +++ b/llvm/test/DebugInfo/2010-04-06-NestedFnDbgInfo.ll @@ -70,7 +70,7 @@ entry: !llvm.module.flags = !{!40} !37 = !{!2, !10, !23} -!0 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "b", line: 16, scope: !1, file: !3, type: !8) +!0 = !DILocalVariable(name: "b", line: 16, scope: !1, file: !3, type: !8) !1 = distinct !DILexicalBlock(line: 15, column: 12, file: !38, scope: !2) !2 = !DISubprogram(name: "main", linkageName: "main", line: 15, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, scopeLine: 15, file: !38, scope: !3, type: !5, function: i32 ()* @main) !3 = !DIFile(filename: "one.cc", directory: "/tmp") @@ -87,9 +87,9 @@ entry: !14 = !DILocation(line: 16, column: 5, scope: !1) !15 = !DILocation(line: 17, column: 3, scope: !1) !16 = !DILocation(line: 18, column: 1, scope: !2) -!17 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 4, arg: 1, scope: !10, file: !3, type: !13) +!17 = !DILocalVariable(name: "this", line: 4, arg: 1, scope: !10, file: !3, type: !13) !18 = !DILocation(line: 4, column: 7, scope: !10) -!19 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "a", line: 9, scope: !20, file: !3, type: !21) +!19 = !DILocalVariable(name: "a", line: 9, scope: !20, file: !3, type: !21) !20 = distinct !DILexicalBlock(line: 4, column: 12, file: !38, scope: !10) !21 = !DICompositeType(tag: DW_TAG_class_type, name: "A", line: 5, size: 8, align: 8, file: !38, scope: !10, elements: !22) !22 = !{!23} @@ -98,12 +98,12 @@ entry: !25 = !{!7, !26} !26 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, flags: DIFlagArtificial, file: !38, scope: !3, baseType: !21) !27 = !DILocation(line: 9, column: 7, scope: !20) -!28 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "i", line: 10, scope: !20, file: !3, type: !7) +!28 = !DILocalVariable(name: "i", line: 10, scope: !20, file: !3, type: !7) !29 = !DILocation(line: 10, column: 9, scope: !20) !30 = !DILocation(line: 10, column: 5, scope: !20) !31 = !DILocation(line: 11, column: 5, scope: !20) !32 = !DILocation(line: 12, column: 3, scope: !10) -!33 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 7, arg: 1, scope: !23, file: !3, type: !26) +!33 = !DILocalVariable(name: "this", line: 7, arg: 1, scope: !23, file: !3, type: !26) !34 = !DILocation(line: 7, column: 11, scope: !23) !35 = !DILocation(line: 7, column: 19, scope: !36) !36 = distinct !DILexicalBlock(line: 7, column: 17, file: !38, scope: !23) diff --git a/llvm/test/DebugInfo/2010-05-03-DisableFramePtr.ll b/llvm/test/DebugInfo/2010-05-03-DisableFramePtr.ll index 96251596d3a..a2f90531c58 100644 --- a/llvm/test/DebugInfo/2010-05-03-DisableFramePtr.ll +++ b/llvm/test/DebugInfo/2010-05-03-DisableFramePtr.ll @@ -18,7 +18,7 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !llvm.dbg.cu = !{!3} !llvm.module.flags = !{!19} -!0 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "userUPP", line: 7, arg: 1, scope: !1, file: !2, type: !6) +!0 = !DILocalVariable(name: "userUPP", line: 7, arg: 1, scope: !1, file: !2, type: !6) !1 = !DISubprogram(name: "DisposeDMNotificationUPP", linkageName: "DisposeDMNotificationUPP", line: 7, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, file: !16, scope: null, type: !4) !2 = !DIFile(filename: "t.c", directory: "/Users/echeng/LLVM/radars/r7937664/") !3 = !DICompileUnit(language: DW_LANG_C89, producer: "4.2.1 (Based on Apple Inc. build 5658) (LLVM build 9999)", isOptimized: true, emissionKind: 0, file: !16, enums: !17, retainedTypes: !17, subprograms: !18) diff --git a/llvm/test/DebugInfo/2010-05-03-OriginDIE.ll b/llvm/test/DebugInfo/2010-05-03-OriginDIE.ll index 40b29fe31f9..f5494348f03 100644 --- a/llvm/test/DebugInfo/2010-05-03-OriginDIE.ll +++ b/llvm/test/DebugInfo/2010-05-03-OriginDIE.ll @@ -58,22 +58,22 @@ declare void @uuid_LtoB(i8*, i8*) !5 = !DISubroutineType(types: !6) !6 = !{null} !7 = !DILocation(line: 810, scope: !1) -!8 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "data", line: 201, arg: 1, scope: !9, file: !10, type: !11) +!8 = !DILocalVariable(name: "data", line: 201, arg: 1, scope: !9, file: !10, type: !11) !9 = !DISubprogram(name: "_OSSwapInt64", linkageName: "_OSSwapInt64", line: 202, isLocal: true, isDefinition: true, virtualIndex: 6, isOptimized: false, file: !10, scope: null, type: !5) !10 = !DIFile(filename: "OSByteOrder.h", directory: "/usr/include/libkern/ppc") !11 = !DIDerivedType(tag: DW_TAG_typedef, name: "uint64_t", line: 59, file: !36, scope: !3, baseType: !13) !12 = !DIFile(filename: "stdint.h", directory: "/usr/4.2.1/include") !13 = !DIBasicType(tag: DW_TAG_base_type, name: "long long unsigned int", size: 64, align: 64, encoding: DW_ATE_unsigned) !14 = !DILocation(line: 202, scope: !9, inlinedAt: !7) -!15 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "base", line: 92, arg: 2, scope: !16, file: !10, type: !17) +!15 = !DILocalVariable(name: "base", line: 92, arg: 2, scope: !16, file: !10, type: !17) !16 = !DISubprogram(name: "OSReadSwapInt64", linkageName: "OSReadSwapInt64", line: 95, isLocal: true, isDefinition: true, virtualIndex: 6, isOptimized: false, file: !38, scope: null, type: !5) !17 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 32, align: 32, file: !39, scope: !3, baseType: null) !18 = !{} -!19 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "byteOffset", line: 94, arg: 3, scope: !16, file: !10, type: !20) +!19 = !DILocalVariable(name: "byteOffset", line: 94, arg: 3, scope: !16, file: !10, type: !20) !20 = !DIDerivedType(tag: DW_TAG_typedef, name: "uintptr_t", line: 114, file: !37, scope: !3, baseType: !22) !21 = !DIFile(filename: "types.h", directory: "/usr/include/ppc") !22 = !DIBasicType(tag: DW_TAG_base_type, name: "long unsigned int", size: 32, align: 32, encoding: DW_ATE_unsigned) -!23 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "u", line: 100, scope: !24, file: !10, type: !25) +!23 = !DILocalVariable(name: "u", line: 100, scope: !24, file: !10, type: !25) !24 = distinct !DILexicalBlock(line: 95, column: 0, file: !38, scope: !16) !25 = !DICompositeType(tag: DW_TAG_union_type, line: 97, size: 64, align: 64, file: !38, scope: !16, elements: !26) !26 = !{!27, !28} @@ -84,7 +84,7 @@ declare void @uuid_LtoB(i8*, i8*) !31 = !DIBasicType(tag: DW_TAG_base_type, name: "unsigned int", size: 32, align: 32, encoding: DW_ATE_unsigned) !32 = !{!33} !33 = !DISubrange(count: 2) -!34 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "addr", line: 96, scope: !24, file: !10, type: !35) +!34 = !DILocalVariable(name: "addr", line: 96, scope: !24, file: !10, type: !35) !35 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 32, align: 32, file: !39, scope: !3, baseType: !11) !36 = !DIFile(filename: "stdint.h", directory: "/usr/4.2.1/include") !37 = !DIFile(filename: "types.h", directory: "/usr/include/ppc") diff --git a/llvm/test/DebugInfo/2010-06-29-InlinedFnLocalVar.ll b/llvm/test/DebugInfo/2010-06-29-InlinedFnLocalVar.ll index 0d7dae9c8c7..e176aaac205 100644 --- a/llvm/test/DebugInfo/2010-06-29-InlinedFnLocalVar.ll +++ b/llvm/test/DebugInfo/2010-06-29-InlinedFnLocalVar.ll @@ -34,11 +34,11 @@ entry: !6 = !DISubprogram(name: "bar", linkageName: "bar", line: 14, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: true, file: !27, scope: !1, type: !7, function: i32 ()* @bar) !7 = !DISubroutineType(types: !8) !8 = !{!5} -!9 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "j", line: 9, arg: 1, scope: !0, file: !1, type: !5) -!10 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "xyz", line: 10, scope: !11, file: !1, type: !12) +!9 = !DILocalVariable(name: "j", line: 9, arg: 1, scope: !0, file: !1, type: !5) +!10 = !DILocalVariable(name: "xyz", line: 10, scope: !11, file: !1, type: !12) -!59 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "j", line: 9, arg: 1, scope: !0, file: !1, type: !5) -!60 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "xyz", line: 10, scope: !11, file: !1, type: !12) +!59 = !DILocalVariable(name: "j", line: 9, arg: 1, scope: !0, file: !1, type: !5) +!60 = !DILocalVariable(name: "xyz", line: 10, scope: !11, file: !1, type: !12) !11 = distinct !DILexicalBlock(line: 9, column: 0, file: !1, scope: !0) !12 = !DICompositeType(tag: DW_TAG_structure_type, name: "X", line: 10, size: 64, align: 32, file: !27, scope: !0, elements: !13) diff --git a/llvm/test/DebugInfo/2010-07-19-Crash.ll b/llvm/test/DebugInfo/2010-07-19-Crash.ll index fbfe9f80189..aceae441364 100644 --- a/llvm/test/DebugInfo/2010-07-19-Crash.ll +++ b/llvm/test/DebugInfo/2010-07-19-Crash.ll @@ -19,7 +19,7 @@ entry: !4 = !{!5} !5 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !6 = !DISubprogram(name: "foo", linkageName: "foo", line: 7, isLocal: true, isDefinition: true, virtualIndex: 6, isOptimized: true, file: !12, scope: !1, type: !3) -!7 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "one", line: 8, scope: !8, file: !1, type: !5) +!7 = !DILocalVariable(name: "one", line: 8, scope: !8, file: !1, type: !5) !8 = distinct !DILexicalBlock(line: 7, column: 18, file: !12, scope: !6) !9 = !DILocation(line: 4, column: 3, scope: !10) !10 = distinct !DILexicalBlock(line: 3, column: 11, file: !12, scope: !0) diff --git a/llvm/test/DebugInfo/2010-10-01-crash.ll b/llvm/test/DebugInfo/2010-10-01-crash.ll index c1d161ce586..5c41a38bc58 100644 --- a/llvm/test/DebugInfo/2010-10-01-crash.ll +++ b/llvm/test/DebugInfo/2010-10-01-crash.ll @@ -17,7 +17,7 @@ declare void @llvm.memcpy.p0i8.p0i8.i32(i8* nocapture, i8* nocapture, i32, i32, !1 = !DIFile(filename: "GSFusedSilica.m", directory: "/Volumes/Data/Users/sabre/Desktop") !2 = !DICompileUnit(language: DW_LANG_ObjC, producer: "clang version 2.9 (trunk 115292)", isOptimized: true, runtimeVersion: 1, emissionKind: 0, file: !25, enums: !26, retainedTypes: !26) !5 = !DIDerivedType(tag: DW_TAG_typedef, name: "CGRect", line: 49, file: !25, baseType: null) -!23 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "rect", line: 53, arg: 2, scope: !0, file: !1, type: !5) +!23 = !DILocalVariable(name: "rect", line: 53, arg: 2, scope: !0, file: !1, type: !5) !24 = !DILocation(line: 53, column: 33, scope: !0) !25 = !DIFile(filename: "GSFusedSilica.m", directory: "/Volumes/Data/Users/sabre/Desktop") !26 = !{} diff --git a/llvm/test/DebugInfo/AArch64/cfi-eof-prologue.ll b/llvm/test/DebugInfo/AArch64/cfi-eof-prologue.ll index 756443a951d..cf380848fda 100644 --- a/llvm/test/DebugInfo/AArch64/cfi-eof-prologue.ll +++ b/llvm/test/DebugInfo/AArch64/cfi-eof-prologue.ll @@ -91,11 +91,11 @@ attributes #3 = { nounwind } !27 = !{!28, !32} !28 = !DISubprogram(name: "B", linkageName: "_ZN1BC2Ev", line: 9, isLocal: false, isDefinition: true, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 9, file: !5, scope: !"_ZTS1B", type: !9, function: %struct.B* (%struct.B*)* @_ZN1BC2Ev, declaration: !8, variables: !29) !29 = !{!30} -!30 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !28, type: !31) +!30 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !28, type: !31) !31 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !"_ZTS1B") !32 = !DISubprogram(name: "B", linkageName: "_ZN1BC1Ev", line: 9, isLocal: false, isDefinition: true, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 9, file: !5, scope: !"_ZTS1B", type: !9, function: %struct.B* (%struct.B*)* @_ZN1BC1Ev, declaration: !8, variables: !33) !33 = !{!34} -!34 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !32, type: !31) +!34 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !32, type: !31) !35 = !{i32 2, !"Dwarf Version", i32 4} !36 = !{i32 2, !"Debug Info Version", i32 3} !37 = !{!"clang version 3.6.0 (trunk 224279) (llvm/trunk 224283)"} @@ -106,7 +106,7 @@ attributes #3 = { nounwind } !42 = !{!"vtable pointer", !43, i64 0} !43 = !{!"Simple C/C++ TBAA"} !44 = !DILocation(line: 0, scope: !32) -!45 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !28, type: !31) +!45 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !28, type: !31) !46 = !DILocation(line: 9, scope: !32) !47 = !DILocation(line: 0, scope: !28, inlinedAt: !46) !48 = !DILocation(line: 9, scope: !28, inlinedAt: !46) diff --git a/llvm/test/DebugInfo/AArch64/coalescing.ll b/llvm/test/DebugInfo/AArch64/coalescing.ll index b1d56619712..66c440bbbd4 100644 --- a/llvm/test/DebugInfo/AArch64/coalescing.ll +++ b/llvm/test/DebugInfo/AArch64/coalescing.ll @@ -54,7 +54,7 @@ attributes #3 = { nounwind optsize } !7 = !DISubroutineType(types: !8) !8 = !{null} !9 = !{!10} -!10 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "size", line: 4, scope: !4, file: !6, type: !11) +!10 = !DILocalVariable(name: "size", line: 4, scope: !4, file: !6, type: !11) !11 = !DIBasicType(tag: DW_TAG_base_type, name: "unsigned int", size: 32, align: 32, encoding: DW_ATE_unsigned) !12 = !{i32 2, !"Dwarf Version", i32 2} !13 = !{i32 2, !"Debug Info Version", i32 3} diff --git a/llvm/test/DebugInfo/AArch64/frameindices.ll b/llvm/test/DebugInfo/AArch64/frameindices.ll index 02907742336..1b114d62a5d 100644 --- a/llvm/test/DebugInfo/AArch64/frameindices.ll +++ b/llvm/test/DebugInfo/AArch64/frameindices.ll @@ -190,16 +190,16 @@ attributes #5 = { builtin } !27 = !DISubroutineType(types: !28) !28 = !{null, !"_ZTS1A"} !29 = !{!30} -!30 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "p1", line: 13, arg: 1, scope: !25, file: !26, type: !"_ZTS1A") +!30 = !DILocalVariable(name: "p1", line: 13, arg: 1, scope: !25, file: !26, type: !"_ZTS1A") !31 = !DISubprogram(name: "f11", linkageName: "_Z3f111A", line: 17, isLocal: false, isDefinition: true, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 17, file: !5, scope: !26, type: !27, function: void (%struct.A*)* @_Z3f111A, variables: !32) !32 = !{!33} -!33 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "p1", line: 17, arg: 1, scope: !31, file: !26, type: !"_ZTS1A") +!33 = !DILocalVariable(name: "p1", line: 17, arg: 1, scope: !31, file: !26, type: !"_ZTS1A") !34 = !DISubprogram(name: "f16", linkageName: "_Z3f16v", line: 18, isLocal: false, isDefinition: true, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 18, file: !5, scope: !26, type: !35, function: void ()* @_Z3f16v, variables: !37) !35 = !DISubroutineType(types: !36) !36 = !{null} !37 = !{!38, !39} -!38 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "c", line: 19, scope: !34, file: !26, type: !"_ZTS1A") -!39 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "d", line: 20, scope: !34, file: !26, type: !"_ZTS1B") +!38 = !DILocalVariable(name: "c", line: 19, scope: !34, file: !26, type: !"_ZTS1A") +!39 = !DILocalVariable(name: "d", line: 20, scope: !34, file: !26, type: !"_ZTS1B") !40 = !{!41, !42} !41 = !DIGlobalVariable(name: "a", line: 1, isLocal: false, isDefinition: true, scope: null, file: !26, type: !20, variable: i64* @a) !42 = !DIGlobalVariable(name: "b", line: 7, isLocal: false, isDefinition: true, scope: null, file: !26, type: !12, variable: i32** @b) @@ -234,7 +234,7 @@ attributes #5 = { builtin } !71 = !DILocation(line: 15, column: 3, scope: !25, inlinedAt: !66) !72 = !DILocation(line: 16, column: 1, scope: !25, inlinedAt: !66) !73 = !DILocation(line: 17, column: 27, scope: !31) -!74 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "p1", line: 17, arg: 1, scope: !31, file: !26, type: !"_ZTS1A") +!74 = !DILocalVariable(name: "p1", line: 17, arg: 1, scope: !31, file: !26, type: !"_ZTS1A") !75 = distinct !DILocation(line: 22, column: 3, scope: !34) !76 = !DIExpression(DW_OP_bit_piece, 8, 120) !77 = !DILocation(line: 17, column: 12, scope: !31, inlinedAt: !75) diff --git a/llvm/test/DebugInfo/AArch64/struct_by_value.ll b/llvm/test/DebugInfo/AArch64/struct_by_value.ll index dc9ac42e8a0..809551026e4 100644 --- a/llvm/test/DebugInfo/AArch64/struct_by_value.ll +++ b/llvm/test/DebugInfo/AArch64/struct_by_value.ll @@ -65,7 +65,7 @@ attributes #1 = { nounwind readnone } !14 = !DIDerivedType(tag: DW_TAG_member, name: "d", line: 6, size: 32, align: 32, offset: 96, file: !1, scope: !9, baseType: !8) !15 = !DIDerivedType(tag: DW_TAG_member, name: "e", line: 7, size: 32, align: 32, offset: 128, file: !1, scope: !9, baseType: !8) !16 = !{i32 2, !"Dwarf Version", i32 2} -!17 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "f", line: 13, arg: 1, scope: !4, file: !5, type: !9) +!17 = !DILocalVariable(name: "f", line: 13, arg: 1, scope: !4, file: !5, type: !9) !18 = !DILocation(line: 13, scope: !4) !19 = !DILocation(line: 16, scope: !4) !20 = !{i32 1, !"Debug Info Version", i32 3} diff --git a/llvm/test/DebugInfo/ARM/PR16736.ll b/llvm/test/DebugInfo/ARM/PR16736.ll index 9d4992210a2..330abb2ad5f 100644 --- a/llvm/test/DebugInfo/ARM/PR16736.ll +++ b/llvm/test/DebugInfo/ARM/PR16736.ll @@ -53,11 +53,11 @@ attributes #3 = { nounwind } !9 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !10 = !DIBasicType(tag: DW_TAG_base_type, name: "float", size: 32, align: 32, encoding: DW_ATE_float) !11 = !{!12, !13, !14, !15, !16} -!12 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "", line: 3, arg: 1, scope: !4, file: !6, type: !9) -!13 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "", line: 3, arg: 2, scope: !4, file: !6, type: !9) -!14 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "", line: 3, arg: 3, scope: !4, file: !6, type: !9) -!15 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "", line: 3, arg: 4, scope: !4, file: !6, type: !9) -!16 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "x", line: 3, arg: 5, scope: !4, file: !6, type: !10) +!12 = !DILocalVariable(name: "", line: 3, arg: 1, scope: !4, file: !6, type: !9) +!13 = !DILocalVariable(name: "", line: 3, arg: 2, scope: !4, file: !6, type: !9) +!14 = !DILocalVariable(name: "", line: 3, arg: 3, scope: !4, file: !6, type: !9) +!15 = !DILocalVariable(name: "", line: 3, arg: 4, scope: !4, file: !6, type: !9) +!16 = !DILocalVariable(name: "x", line: 3, arg: 5, scope: !4, file: !6, type: !10) !17 = !{i32 2, !"Dwarf Version", i32 4} !18 = !DILocation(line: 3, scope: !4) !19 = !DILocation(line: 4, scope: !4) diff --git a/llvm/test/DebugInfo/ARM/cfi-eof-prologue.ll b/llvm/test/DebugInfo/ARM/cfi-eof-prologue.ll index 07e4d8a717b..c5bf93c834b 100644 --- a/llvm/test/DebugInfo/ARM/cfi-eof-prologue.ll +++ b/llvm/test/DebugInfo/ARM/cfi-eof-prologue.ll @@ -92,11 +92,11 @@ attributes #3 = { nounwind } !27 = !{!28, !32} !28 = !DISubprogram(name: "B", linkageName: "_ZN1BC2Ev", line: 9, isLocal: false, isDefinition: true, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 9, file: !5, scope: !"_ZTS1B", type: !9, function: %struct.B* (%struct.B*)* @_ZN1BC2Ev, declaration: !8, variables: !29) !29 = !{!30} -!30 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !28, type: !31) +!30 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !28, type: !31) !31 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 32, align: 32, baseType: !"_ZTS1B") !32 = !DISubprogram(name: "B", linkageName: "_ZN1BC1Ev", line: 9, isLocal: false, isDefinition: true, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 9, file: !5, scope: !"_ZTS1B", type: !9, function: %struct.B* (%struct.B*)* @_ZN1BC1Ev, declaration: !8, variables: !33) !33 = !{!34} -!34 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !32, type: !31) +!34 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !32, type: !31) !35 = !{i32 2, !"Dwarf Version", i32 4} !36 = !{i32 2, !"Debug Info Version", i32 3} !37 = !{i32 1, !"wchar_size", i32 4} @@ -109,7 +109,7 @@ attributes #3 = { nounwind } !44 = !{!"vtable pointer", !45, i64 0} !45 = !{!"Simple C/C++ TBAA"} !46 = !DILocation(line: 0, scope: !32) -!47 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !28, type: !31) +!47 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !28, type: !31) !48 = !DILocation(line: 9, scope: !32) !49 = !DILocation(line: 0, scope: !28, inlinedAt: !48) !50 = !DILocation(line: 9, scope: !28, inlinedAt: !48) diff --git a/llvm/test/DebugInfo/ARM/lowerbdgdeclare_vla.ll b/llvm/test/DebugInfo/ARM/lowerbdgdeclare_vla.ll index daf26507a03..1efa46c16e7 100644 --- a/llvm/test/DebugInfo/ARM/lowerbdgdeclare_vla.ll +++ b/llvm/test/DebugInfo/ARM/lowerbdgdeclare_vla.ll @@ -78,14 +78,14 @@ attributes #1 = { nounwind readnone } !8 = !{null, !9} !9 = !DIBasicType(tag: DW_TAG_base_type, name: "float", size: 32, align: 32, encoding: DW_ATE_float) !10 = !{!11, !12, !14, !18} -!11 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "r", line: 1, arg: 1, scope: !4, file: !6, type: !9) -!12 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "count", line: 3, scope: !4, file: !6, type: !13) +!11 = !DILocalVariable(name: "r", line: 1, arg: 1, scope: !4, file: !6, type: !9) +!12 = !DILocalVariable(name: "count", line: 3, scope: !4, file: !6, type: !13) !13 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -!14 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "vla", line: 4, scope: !4, file: !6, type: !15) +!14 = !DILocalVariable(name: "vla", line: 4, scope: !4, file: !6, type: !15) !15 = !DICompositeType(tag: DW_TAG_array_type, align: 32, baseType: !9, elements: !16) !16 = !{!17} !17 = !DISubrange(count: -1) -!18 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "i", line: 6, scope: !19, file: !6, type: !13) +!18 = !DILocalVariable(name: "i", line: 6, scope: !19, file: !6, type: !13) !19 = distinct !DILexicalBlock(line: 6, column: 0, file: !5, scope: !4) !20 = !{i32 2, !"Dwarf Version", i32 2} !21 = !{!"clang version 3.4 "} diff --git a/llvm/test/DebugInfo/ARM/s-super-register.ll b/llvm/test/DebugInfo/ARM/s-super-register.ll index def87695ccc..813063a3162 100644 --- a/llvm/test/DebugInfo/ARM/s-super-register.ll +++ b/llvm/test/DebugInfo/ARM/s-super-register.ll @@ -45,10 +45,10 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !2 = !DIFile(filename: "k.cc", directory: "/private/tmp") !3 = !DISubroutineType(types: !4) !4 = !{null} -!5 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "k", line: 6, scope: !6, file: !2, type: !7) +!5 = !DILocalVariable(name: "k", line: 6, scope: !6, file: !2, type: !7) !6 = distinct !DILexicalBlock(line: 5, column: 12, file: !18, scope: !1) !7 = !DIBasicType(tag: DW_TAG_base_type, name: "float", size: 32, align: 32, encoding: DW_ATE_float) -!8 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "y", line: 8, scope: !9, file: !2, type: !7) +!8 = !DILocalVariable(name: "y", line: 8, scope: !9, file: !2, type: !7) !9 = distinct !DILexicalBlock(line: 7, column: 25, file: !18, scope: !10) !10 = distinct !DILexicalBlock(line: 7, column: 3, file: !18, scope: !6) !11 = !DILocation(line: 6, column: 18, scope: !6) diff --git a/llvm/test/DebugInfo/ARM/selectiondag-deadcode.ll b/llvm/test/DebugInfo/ARM/selectiondag-deadcode.ll index 1b6528269f7..8e327f86de7 100644 --- a/llvm/test/DebugInfo/ARM/selectiondag-deadcode.ll +++ b/llvm/test/DebugInfo/ARM/selectiondag-deadcode.ll @@ -24,4 +24,4 @@ declare arm_aapcscc void @_ZL4Sqrtd() #2 !39 = !DISubprogram(name: "GetMatrix", linkageName: "_Z9GetMatrixv", line: 32, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 32, file: !5, scope: !40, type: !41, function: void (%class.Matrix3.0.6.10*)* @_Z9GetMatrixv) !40 = !DIFile(filename: "test.ii", directory: "/Volumes/Data/radar/15094721") !41 = !DISubroutineType(types: null) -!45 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "matrix", line: 35, scope: !39, file: !40, type: !4) +!45 = !DILocalVariable(name: "matrix", line: 35, scope: !39, file: !40, type: !4) diff --git a/llvm/test/DebugInfo/ARM/single-constant-use-preserves-dbgloc.ll b/llvm/test/DebugInfo/ARM/single-constant-use-preserves-dbgloc.ll index 396eb4fe194..fc92dd83fd4 100644 --- a/llvm/test/DebugInfo/ARM/single-constant-use-preserves-dbgloc.ll +++ b/llvm/test/DebugInfo/ARM/single-constant-use-preserves-dbgloc.ll @@ -58,7 +58,7 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) !7 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !8 = !{i32 2, !"Dwarf Version", i32 4} !9 = !{i32 2, !"Debug Info Version", i32 3} -!10 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "x", scope: !4, file: !1, line: 3, type: !7) +!10 = !DILocalVariable(name: "x", scope: !4, file: !1, line: 3, type: !7) !11 = !DIExpression() !12 = !DILocation(line: 3, column: 9, scope: !4) !13 = !DILocation(line: 4, column: 9, scope: !14) diff --git a/llvm/test/DebugInfo/Mips/InlinedFnLocalVar.ll b/llvm/test/DebugInfo/Mips/InlinedFnLocalVar.ll index 5c67cc9ea98..226e12ddf97 100644 --- a/llvm/test/DebugInfo/Mips/InlinedFnLocalVar.ll +++ b/llvm/test/DebugInfo/Mips/InlinedFnLocalVar.ll @@ -34,11 +34,11 @@ entry: !6 = !DISubprogram(name: "bar", linkageName: "bar", line: 14, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: true, file: !27, scope: !1, type: !7, function: i32 ()* @bar) !7 = !DISubroutineType(types: !8) !8 = !{!5} -!9 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "j", line: 9, arg: 1, scope: !0, file: !1, type: !5) -!10 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "xyz", line: 10, scope: !11, file: !1, type: !12) +!9 = !DILocalVariable(name: "j", line: 9, arg: 1, scope: !0, file: !1, type: !5) +!10 = !DILocalVariable(name: "xyz", line: 10, scope: !11, file: !1, type: !12) -!59 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "j", line: 9, arg: 1, scope: !0, file: !1, type: !5) -!60 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "xyz", line: 10, scope: !11, file: !1, type: !12) +!59 = !DILocalVariable(name: "j", line: 9, arg: 1, scope: !0, file: !1, type: !5) +!60 = !DILocalVariable(name: "xyz", line: 10, scope: !11, file: !1, type: !12) !11 = distinct !DILexicalBlock(line: 9, column: 0, file: !1, scope: !0) !12 = !DICompositeType(tag: DW_TAG_structure_type, name: "X", line: 10, size: 64, align: 32, file: !27, scope: !0, elements: !13) diff --git a/llvm/test/DebugInfo/Mips/delay-slot.ll b/llvm/test/DebugInfo/Mips/delay-slot.ll index df01775a12e..ae61ccd90df 100644 --- a/llvm/test/DebugInfo/Mips/delay-slot.ll +++ b/llvm/test/DebugInfo/Mips/delay-slot.ll @@ -68,7 +68,7 @@ attributes #1 = { nounwind readnone } !9 = !{i32 2, !"Dwarf Version", i32 4} !10 = !{i32 2, !"Debug Info Version", i32 3} !11 = !{!"clang version 3.5.0"} -!12 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "x", line: 1, arg: 1, scope: !4, file: !5, type: !8) +!12 = !DILocalVariable(name: "x", line: 1, arg: 1, scope: !4, file: !5, type: !8) !13 = !DILocation(line: 1, scope: !4) !14 = !DILocation(line: 2, scope: !15) !15 = distinct !DILexicalBlock(line: 2, column: 0, file: !1, scope: !4) diff --git a/llvm/test/DebugInfo/PR20038.ll b/llvm/test/DebugInfo/PR20038.ll index 8691895f41a..80e688764b7 100644 --- a/llvm/test/DebugInfo/PR20038.ll +++ b/llvm/test/DebugInfo/PR20038.ll @@ -149,15 +149,15 @@ attributes #2 = { nounwind readnone } !26 = distinct !DILexicalBlock(line: 5, column: 0, file: !5, scope: !12) !27 = !DILocation(line: 5, scope: !28) !28 = distinct !DILexicalBlock(line: 5, column: 0, file: !5, scope: !12) -!29 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !17, type: !30) +!29 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !17, type: !30) !30 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !"_ZTS1C") !31 = !DILocation(line: 0, scope: !17, inlinedAt: !22) -!32 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !16, type: !30) +!32 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !16, type: !30) !33 = !DILocation(line: 0, scope: !16, inlinedAt: !21) -!129 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !17, type: !30) -!132 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !16, type: !30) -!232 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !16, type: !30) +!129 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !17, type: !30) +!132 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !16, type: !30) +!232 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !16, type: !30) !34 = !DILocation(line: 5, scope: !35) !35 = distinct !DILexicalBlock(line: 5, column: 0, file: !5, scope: !36) diff --git a/llvm/test/DebugInfo/SystemZ/variable-loc.ll b/llvm/test/DebugInfo/SystemZ/variable-loc.ll index 5f4fe258b97..763a7ddc4d5 100644 --- a/llvm/test/DebugInfo/SystemZ/variable-loc.ll +++ b/llvm/test/DebugInfo/SystemZ/variable-loc.ll @@ -67,12 +67,12 @@ declare i32 @printf(i8*, ...) !14 = !DISubprogram(name: "main", line: 18, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 18, file: !29, scope: !6, type: !15, function: i32 ()* @main, variables: !1) !15 = !DISubroutineType(types: !16) !16 = !{!10} -!17 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "main_arr", line: 19, scope: !18, file: !6, type: !19) +!17 = !DILocalVariable(name: "main_arr", line: 19, scope: !18, file: !6, type: !19) !18 = distinct !DILexicalBlock(line: 18, column: 16, file: !29, scope: !14) !19 = !DICompositeType(tag: DW_TAG_array_type, size: 3200, align: 32, baseType: !10, elements: !{!20}) !20 = !DISubrange(count: 99) !22 = !DILocation(line: 19, column: 7, scope: !18) -!23 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "val", line: 20, scope: !18, file: !6, type: !10) +!23 = !DILocalVariable(name: "val", line: 20, scope: !18, file: !6, type: !10) !24 = !DILocation(line: 20, column: 7, scope: !18) !25 = !DILocation(line: 22, column: 3, scope: !18) !26 = !DILocation(line: 23, column: 9, scope: !18) diff --git a/llvm/test/DebugInfo/X86/2010-04-13-PubType.ll b/llvm/test/DebugInfo/X86/2010-04-13-PubType.ll index aa1bf4aaf5f..240929c66bf 100644 --- a/llvm/test/DebugInfo/X86/2010-04-13-PubType.ll +++ b/llvm/test/DebugInfo/X86/2010-04-13-PubType.ll @@ -31,7 +31,7 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !llvm.dbg.cu = !{!3} !llvm.module.flags = !{!20} -!0 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "x", line: 7, arg: 1, scope: !1, file: !2, type: !7) +!0 = !DILocalVariable(name: "x", line: 7, arg: 1, scope: !1, file: !2, type: !7) !1 = !DISubprogram(name: "foo", linkageName: "foo", line: 7, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, scopeLine: 7, file: !18, scope: !2, type: !4, function: i32 (%struct.X*, %struct.Y*)* @foo) !2 = !DIFile(filename: "a.c", directory: "/tmp/") !3 = !DICompileUnit(language: DW_LANG_C89, producer: "4.2.1 (Based on Apple Inc. build 5658) (LLVM build)", isOptimized: false, emissionKind: 0, file: !18, enums: !19, retainedTypes: !19, subprograms: !17, imports: null) @@ -45,7 +45,7 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !11 = !{!12} !12 = !DIDerivedType(tag: DW_TAG_member, name: "x", line: 5, size: 32, align: 32, file: !18, scope: !10, baseType: !6) !13 = !DILocation(line: 7, scope: !1) -!14 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "y", line: 7, arg: 2, scope: !1, file: !2, type: !9) +!14 = !DILocalVariable(name: "y", line: 7, arg: 2, scope: !1, file: !2, type: !9) !15 = !DILocation(line: 7, scope: !16) !16 = distinct !DILexicalBlock(line: 7, column: 0, file: !18, scope: !1) !17 = !{!1} diff --git a/llvm/test/DebugInfo/X86/2011-09-26-GlobalVarContext.ll b/llvm/test/DebugInfo/X86/2011-09-26-GlobalVarContext.ll index 1252f2cb32e..35611723fa0 100644 --- a/llvm/test/DebugInfo/X86/2011-09-26-GlobalVarContext.ll +++ b/llvm/test/DebugInfo/X86/2011-09-26-GlobalVarContext.ll @@ -29,7 +29,7 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !9 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !12 = !{!14} !14 = !DIGlobalVariable(name: "GLB", line: 1, isLocal: false, isDefinition: true, scope: null, file: !6, type: !9, variable: i32* @GLB) -!15 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "LOC", line: 4, scope: !16, file: !6, type: !9) +!15 = !DILocalVariable(name: "LOC", line: 4, scope: !16, file: !6, type: !9) !16 = distinct !DILexicalBlock(line: 3, column: 9, file: !20, scope: !5) !17 = !DILocation(line: 4, column: 9, scope: !16) !18 = !DILocation(line: 4, column: 23, scope: !16) diff --git a/llvm/test/DebugInfo/X86/2011-12-16-BadStructRef.ll b/llvm/test/DebugInfo/X86/2011-12-16-BadStructRef.ll index fc3f69b3584..5bd068e0cc5 100644 --- a/llvm/test/DebugInfo/X86/2011-12-16-BadStructRef.ll +++ b/llvm/test/DebugInfo/X86/2011-12-16-BadStructRef.ll @@ -129,35 +129,35 @@ entry: !44 = !{!45} !45 = !{} ; previously: invalid DW_TAG_base_type !46 = !DISubprogram(name: "baz", linkageName: "_ZN3bazC2Ei", line: 6, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, file: !82, scope: null, type: !14, function: void (%struct.baz*, i32)* @_ZN3bazC2Ei, declaration: !13) -!49 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "argc", line: 16, arg: 1, scope: !29, file: !6, type: !12) +!49 = !DILocalVariable(name: "argc", line: 16, arg: 1, scope: !29, file: !6, type: !12) !50 = !DILocation(line: 16, column: 14, scope: !29) -!51 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "argv", line: 16, arg: 2, scope: !29, file: !6, type: !32) +!51 = !DILocalVariable(name: "argv", line: 16, arg: 2, scope: !29, file: !6, type: !32) !52 = !DILocation(line: 16, column: 27, scope: !29) -!53 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "myBar", line: 18, scope: !54, file: !6, type: !5) +!53 = !DILocalVariable(name: "myBar", line: 18, scope: !54, file: !6, type: !5) !54 = distinct !DILexicalBlock(line: 17, column: 1, file: !82, scope: !29) !55 = !DILocation(line: 18, column: 9, scope: !54) !56 = !DILocation(line: 18, column: 17, scope: !54) !57 = !DILocation(line: 19, column: 5, scope: !54) -!58 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 13, arg: 1, flags: DIFlagArtificial, scope: !37, file: !6, type: !24) +!58 = !DILocalVariable(name: "this", line: 13, arg: 1, flags: DIFlagArtificial, scope: !37, file: !6, type: !24) !59 = !DILocation(line: 13, column: 5, scope: !37) -!60 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "x", line: 13, arg: 2, scope: !37, file: !6, type: !12) +!60 = !DILocalVariable(name: "x", line: 13, arg: 2, scope: !37, file: !6, type: !12) !61 = !DILocation(line: 13, column: 13, scope: !37) !62 = !DILocation(line: 13, column: 34, scope: !37) -!63 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 13, arg: 1, flags: DIFlagArtificial, scope: !40, file: !6, type: !24) +!63 = !DILocalVariable(name: "this", line: 13, arg: 1, flags: DIFlagArtificial, scope: !40, file: !6, type: !24) !64 = !DILocation(line: 13, column: 5, scope: !40) -!65 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "x", line: 13, arg: 2, scope: !40, file: !6, type: !12) +!65 = !DILocalVariable(name: "x", line: 13, arg: 2, scope: !40, file: !6, type: !12) !66 = !DILocation(line: 13, column: 13, scope: !40) !67 = !DILocation(line: 13, column: 33, scope: !40) !68 = !DILocation(line: 13, column: 34, scope: !69) !69 = distinct !DILexicalBlock(line: 13, column: 33, file: !82, scope: !40) -!70 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 6, arg: 1, flags: DIFlagArtificial, scope: !43, file: !6, type: !16) +!70 = !DILocalVariable(name: "this", line: 6, arg: 1, flags: DIFlagArtificial, scope: !43, file: !6, type: !16) !71 = !DILocation(line: 6, column: 5, scope: !43) -!72 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "a", line: 6, arg: 2, scope: !43, file: !6, type: !12) +!72 = !DILocalVariable(name: "a", line: 6, arg: 2, scope: !43, file: !6, type: !12) !73 = !DILocation(line: 6, column: 13, scope: !43) !74 = !DILocation(line: 6, column: 24, scope: !43) -!75 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 6, arg: 1, flags: DIFlagArtificial, scope: !46, file: !6, type: !16) +!75 = !DILocalVariable(name: "this", line: 6, arg: 1, flags: DIFlagArtificial, scope: !46, file: !6, type: !16) !76 = !DILocation(line: 6, column: 5, scope: !46) -!77 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "a", line: 6, arg: 2, scope: !46, file: !6, type: !12) +!77 = !DILocalVariable(name: "a", line: 6, arg: 2, scope: !46, file: !6, type: !12) !78 = !DILocation(line: 6, column: 13, scope: !46) !79 = !DILocation(line: 6, column: 23, scope: !46) !80 = !DILocation(line: 6, column: 24, scope: !81) diff --git a/llvm/test/DebugInfo/X86/DW_AT_byte_size.ll b/llvm/test/DebugInfo/X86/DW_AT_byte_size.ll index bfad4fe261d..f46032760ef 100644 --- a/llvm/test/DebugInfo/X86/DW_AT_byte_size.ll +++ b/llvm/test/DebugInfo/X86/DW_AT_byte_size.ll @@ -38,7 +38,7 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !11 = !DICompositeType(tag: DW_TAG_class_type, name: "A", line: 1, size: 32, align: 32, file: !20, elements: !12) !12 = !{!13} !13 = !DIDerivedType(tag: DW_TAG_member, name: "b", line: 1, size: 32, align: 32, file: !20, scope: !11, baseType: !9) -!16 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "a", line: 3, arg: 1, scope: !5, file: !6, type: !10) +!16 = !DILocalVariable(name: "a", line: 3, arg: 1, scope: !5, file: !6, type: !10) !17 = !DILocation(line: 3, column: 13, scope: !5) !18 = !DILocation(line: 4, column: 3, scope: !19) !19 = distinct !DILexicalBlock(line: 3, column: 16, file: !20, scope: !5) diff --git a/llvm/test/DebugInfo/X86/DW_AT_linkage_name.ll b/llvm/test/DebugInfo/X86/DW_AT_linkage_name.ll index 7f18b5037d5..57f4bb31a2b 100644 --- a/llvm/test/DebugInfo/X86/DW_AT_linkage_name.ll +++ b/llvm/test/DebugInfo/X86/DW_AT_linkage_name.ll @@ -101,14 +101,14 @@ attributes #2 = { ssp uwtable } !23 = !{i32 2, !"Dwarf Version", i32 2} !24 = !{i32 1, !"Debug Info Version", i32 3} !25 = !{!"clang version 3.5.0 "} -!26 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !17, type: !27) +!26 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !17, type: !27) !27 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !"_ZTS1A") !28 = !DILocation(line: 0, scope: !17) !29 = !DILocation(line: 8, scope: !17) -!30 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !18, type: !27) +!30 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !18, type: !27) !31 = !DILocation(line: 0, scope: !18) !32 = !DILocation(line: 6, scope: !18) !33 = !DILocation(line: 8, scope: !18) -!34 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "a", line: 11, scope: !19, file: !20, type: !"_ZTS1A") +!34 = !DILocalVariable(name: "a", line: 11, scope: !19, file: !20, type: !"_ZTS1A") !35 = !DILocation(line: 11, scope: !19) !36 = !DILocation(line: 12, scope: !19) diff --git a/llvm/test/DebugInfo/X86/DW_AT_location-reference.ll b/llvm/test/DebugInfo/X86/DW_AT_location-reference.ll index 96d1e509957..ae080b9a1fd 100644 --- a/llvm/test/DebugInfo/X86/DW_AT_location-reference.ll +++ b/llvm/test/DebugInfo/X86/DW_AT_location-reference.ll @@ -107,7 +107,7 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !2 = !DICompileUnit(language: DW_LANG_C99, producer: "clang version 3.0 (trunk)", isOptimized: true, emissionKind: 1, file: !23, enums: !{}, retainedTypes: !{}, subprograms: !21, imports: null) !3 = !DISubroutineType(types: !4) !4 = !{null} -!5 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "x", line: 5, scope: !6, file: !1, type: !7) +!5 = !DILocalVariable(name: "x", line: 5, scope: !6, file: !1, type: !7) !6 = distinct !DILexicalBlock(line: 4, column: 14, file: !23, scope: !0) !7 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !8 = !DILocation(line: 6, column: 3, scope: !6) diff --git a/llvm/test/DebugInfo/X86/DW_AT_object_pointer.ll b/llvm/test/DebugInfo/X86/DW_AT_object_pointer.ll index 86d67cae6b0..31f28ea49a1 100644 --- a/llvm/test/DebugInfo/X86/DW_AT_object_pointer.ll +++ b/llvm/test/DebugInfo/X86/DW_AT_object_pointer.ll @@ -68,21 +68,21 @@ entry: !16 = !DIDerivedType(tag: DW_TAG_member, name: "m_a", line: 4, size: 32, align: 32, file: !37, scope: !14, baseType: !9) !17 = !DISubprogram(name: "A", line: 3, isLocal: false, isDefinition: false, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 3, file: !6, scope: !14, type: !11) !20 = !DISubprogram(name: "A", linkageName: "_ZN1AC2Ev", line: 3, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 3, file: !6, scope: null, type: !11, function: void (%class.A*)* @_ZN1AC2Ev, declaration: !17, variables: !1) -!21 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "a", line: 8, scope: !22, file: !6, type: !14) +!21 = !DILocalVariable(name: "a", line: 8, scope: !22, file: !6, type: !14) !22 = distinct !DILexicalBlock(line: 7, column: 11, file: !6, scope: !5) !23 = !DILocation(line: 8, column: 5, scope: !22) !24 = !DILocation(line: 8, column: 6, scope: !22) !25 = !DILocation(line: 9, column: 3, scope: !22) -!26 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 3, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !10, file: !6, type: !27) +!26 = !DILocalVariable(name: "this", line: 3, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !10, file: !6, type: !27) !27 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !14) !28 = !DILocation(line: 3, column: 3, scope: !10) !29 = !DILocation(line: 3, column: 18, scope: !10) -!30 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 3, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !20, file: !6, type: !27) +!30 = !DILocalVariable(name: "this", line: 3, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !20, file: !6, type: !27) !31 = !DILocation(line: 3, column: 3, scope: !20) !32 = !DILocation(line: 3, column: 9, scope: !33) !33 = distinct !DILexicalBlock(line: 3, column: 7, file: !6, scope: !20) !34 = !DILocation(line: 3, column: 18, scope: !33) !35 = !DILocation(line: 7, scope: !5) -!36 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "", line: 7, arg: 1, scope: !5, file: !6, type: !9) +!36 = !DILocalVariable(name: "", line: 7, arg: 1, scope: !5, file: !6, type: !9) !37 = !DIFile(filename: "bar.cpp", directory: "/Users/echristo/debug-tests") !38 = !{i32 1, !"Debug Info Version", i32 3} diff --git a/llvm/test/DebugInfo/X86/InlinedFnLocalVar.ll b/llvm/test/DebugInfo/X86/InlinedFnLocalVar.ll index c73a7b6a421..6c50eeeff85 100644 --- a/llvm/test/DebugInfo/X86/InlinedFnLocalVar.ll +++ b/llvm/test/DebugInfo/X86/InlinedFnLocalVar.ll @@ -34,11 +34,11 @@ entry: !6 = !DISubprogram(name: "bar", linkageName: "bar", line: 14, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: true, file: !27, scope: !1, type: !7, function: i32 ()* @bar) !7 = !DISubroutineType(types: !8) !8 = !{!5} -!9 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "j", line: 9, arg: 1, scope: !0, file: !1, type: !5) -!10 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "xyz", line: 10, scope: !11, file: !1, type: !12) +!9 = !DILocalVariable(name: "j", line: 9, arg: 1, scope: !0, file: !1, type: !5) +!10 = !DILocalVariable(name: "xyz", line: 10, scope: !11, file: !1, type: !12) -!109 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "j", line: 9, arg: 1, scope: !0, file: !1, type: !5) -!110 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "xyz", line: 10, scope: !11, file: !1, type: !12) +!109 = !DILocalVariable(name: "j", line: 9, arg: 1, scope: !0, file: !1, type: !5) +!110 = !DILocalVariable(name: "xyz", line: 10, scope: !11, file: !1, type: !12) !11 = distinct !DILexicalBlock(line: 9, column: 0, file: !1, scope: !0) !12 = !DICompositeType(tag: DW_TAG_structure_type, name: "X", line: 10, size: 64, align: 32, file: !27, scope: !0, elements: !13) diff --git a/llvm/test/DebugInfo/X86/aligned_stack_var.ll b/llvm/test/DebugInfo/X86/aligned_stack_var.ll index 560125d6f40..a24a27f334d 100644 --- a/llvm/test/DebugInfo/X86/aligned_stack_var.ll +++ b/llvm/test/DebugInfo/X86/aligned_stack_var.ll @@ -34,7 +34,7 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !6 = !DIFile(filename: "test.cc", directory: "/home/samsonov/debuginfo") !7 = !DISubroutineType(types: !8) !8 = !{null} -!9 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "x", line: 2, scope: !10, file: !6, type: !11) +!9 = !DILocalVariable(name: "x", line: 2, scope: !10, file: !6, type: !11) !10 = distinct !DILexicalBlock(line: 1, column: 12, file: !14, scope: !5) !11 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !12 = !DILocation(line: 2, column: 7, scope: !10) diff --git a/llvm/test/DebugInfo/X86/arguments.ll b/llvm/test/DebugInfo/X86/arguments.ll index 0af119b241f..6a587185b57 100644 --- a/llvm/test/DebugInfo/X86/arguments.ll +++ b/llvm/test/DebugInfo/X86/arguments.ll @@ -67,9 +67,9 @@ attributes #1 = { nounwind readnone } !15 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, flags: DIFlagArtificial | DIFlagObjectPointer, baseType: !8) !16 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !17) !17 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !8) -!19 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "f", line: 6, arg: 1, scope: !4, file: !5, type: !8) +!19 = !DILocalVariable(name: "f", line: 6, arg: 1, scope: !4, file: !5, type: !8) !20 = !DILocation(line: 6, scope: !4) -!21 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "g", line: 6, arg: 2, scope: !4, file: !5, type: !8) +!21 = !DILocalVariable(name: "g", line: 6, arg: 2, scope: !4, file: !5, type: !8) !22 = !DILocation(line: 7, scope: !4) !23 = !DILocation(line: 8, scope: !4) !24 = !{i32 1, !"Debug Info Version", i32 3} diff --git a/llvm/test/DebugInfo/X86/array.ll b/llvm/test/DebugInfo/X86/array.ll index 8da2079a053..8a59c24d1c0 100644 --- a/llvm/test/DebugInfo/X86/array.ll +++ b/llvm/test/DebugInfo/X86/array.ll @@ -71,7 +71,7 @@ attributes #2 = { nounwind readnone } !8 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !9) !9 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !10 = !{!11} -!11 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "p", line: 1, arg: 1, scope: !4, file: !5, type: !8) +!11 = !DILocalVariable(name: "p", line: 1, arg: 1, scope: !4, file: !5, type: !8) !12 = !DISubprogram(name: "main", line: 5, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 5, file: !1, scope: !5, type: !13, function: i32 (i32, i8**)* @main, variables: !18) !13 = !DISubroutineType(types: !14) !14 = !{!9, !9, !15} @@ -79,9 +79,9 @@ attributes #2 = { nounwind readnone } !16 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !17) !17 = !DIBasicType(tag: DW_TAG_base_type, name: "char", size: 8, align: 8, encoding: DW_ATE_signed_char) !18 = !{!19, !20, !21} -!19 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "argc", line: 5, arg: 1, scope: !12, file: !5, type: !9) -!20 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "argv", line: 5, arg: 2, scope: !12, file: !5, type: !15) -!21 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "array", line: 6, scope: !12, file: !5, type: !22) +!19 = !DILocalVariable(name: "argc", line: 5, arg: 1, scope: !12, file: !5, type: !9) +!20 = !DILocalVariable(name: "argv", line: 5, arg: 2, scope: !12, file: !5, type: !15) +!21 = !DILocalVariable(name: "array", line: 6, scope: !12, file: !5, type: !22) !22 = !DICompositeType(tag: DW_TAG_array_type, size: 128, align: 32, baseType: !9, elements: !23) !23 = !{!24} !24 = !DISubrange(count: 4) diff --git a/llvm/test/DebugInfo/X86/array2.ll b/llvm/test/DebugInfo/X86/array2.ll index e08c52640b3..61f2f1028fd 100644 --- a/llvm/test/DebugInfo/X86/array2.ll +++ b/llvm/test/DebugInfo/X86/array2.ll @@ -17,7 +17,7 @@ ; ; CHECK: define i32 @main ; CHECK: call void @llvm.dbg.value(metadata i32 42, i64 0, metadata ![[ARRAY:[0-9]+]], metadata ![[EXPR:[0-9]+]]) -; CHECK: ![[ARRAY]] = !DILocalVariable(tag: DW_TAG_auto_variable, name: "array",{{.*}} line: 6 +; CHECK: ![[ARRAY]] = !DILocalVariable(name: "array",{{.*}} line: 6 ; CHECK: ![[EXPR]] = !DIExpression(DW_OP_bit_piece, 0, 32) target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.9.0" @@ -91,14 +91,14 @@ attributes #2 = { nounwind } !16 = !{i32 2, !"Dwarf Version", i32 2} !17 = !{i32 1, !"Debug Info Version", i32 3} !18 = !{!"clang version 3.5.0 "} -!19 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "p", line: 1, arg: 1, scope: !4, file: !5, type: !8) +!19 = !DILocalVariable(name: "p", line: 1, arg: 1, scope: !4, file: !5, type: !8) !20 = !DILocation(line: 1, scope: !4) !21 = !DILocation(line: 2, scope: !4) !22 = !DILocation(line: 3, scope: !4) -!23 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "argc", line: 5, arg: 1, scope: !10, file: !5, type: !9) +!23 = !DILocalVariable(name: "argc", line: 5, arg: 1, scope: !10, file: !5, type: !9) !24 = !DILocation(line: 5, scope: !10) -!25 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "argv", line: 5, arg: 2, scope: !10, file: !5, type: !13) -!26 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "array", line: 6, scope: !10, file: !5, type: !27) +!25 = !DILocalVariable(name: "argv", line: 5, arg: 2, scope: !10, file: !5, type: !13) +!26 = !DILocalVariable(name: "array", line: 6, scope: !10, file: !5, type: !27) !27 = !DICompositeType(tag: DW_TAG_array_type, size: 128, align: 32, baseType: !9, elements: !28) !28 = !{!29} !29 = !DISubrange(count: 4) diff --git a/llvm/test/DebugInfo/X86/block-capture.ll b/llvm/test/DebugInfo/X86/block-capture.ll index fe026d656bb..7e844f854b1 100644 --- a/llvm/test/DebugInfo/X86/block-capture.ll +++ b/llvm/test/DebugInfo/X86/block-capture.ll @@ -102,7 +102,7 @@ attributes #3 = { nounwind } !41 = !DIBasicType(tag: DW_TAG_base_type, name: "long unsigned int", size: 64, align: 64, encoding: DW_ATE_unsigned) !42 = !DIDerivedType(tag: DW_TAG_member, name: "Size", size: 64, align: 64, offset: 64, file: !1, scope: !5, baseType: !41) !43 = !DIExpression() -!47 = !DILocalVariable(tag: DW_TAG_arg_variable, name: ".block_descriptor", line: 2, arg: 1, flags: DIFlagArtificial, scope: !8, file: !5, type: !48) +!47 = !DILocalVariable(name: ".block_descriptor", line: 2, arg: 1, flags: DIFlagArtificial, scope: !8, file: !5, type: !48) !48 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, baseType: !49) !49 = !DICompositeType(tag: DW_TAG_structure_type, name: "__block_literal_1", line: 2, size: 320, align: 64, file: !1, scope: !5, elements: !50) !50 = !{!51, !52, !53, !54, !56, !65} @@ -123,7 +123,7 @@ attributes #3 = { nounwind } !65 = !DIDerivedType(tag: DW_TAG_member, name: "block", line: 2, size: 64, align: 64, offset: 256, flags: DIFlagPublic, file: !1, scope: !5, baseType: !25) !66 = !DILocation(line: 2, column: 20, scope: !8) !67 = !DILocation(line: 2, column: 21, scope: !8) -!68 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "block", line: 2, scope: !8, file: !5, type: !25) +!68 = !DILocalVariable(name: "block", line: 2, scope: !8, file: !5, type: !25) !69 = !DIExpression(DW_OP_deref, DW_OP_plus, 32) !70 = !DILocation(line: 2, column: 9, scope: !8) !71 = !DILocation(line: 2, column: 23, scope: !72) diff --git a/llvm/test/DebugInfo/X86/byvalstruct.ll b/llvm/test/DebugInfo/X86/byvalstruct.ll index dedbfb0200b..2d48ac358d3 100644 --- a/llvm/test/DebugInfo/X86/byvalstruct.ll +++ b/llvm/test/DebugInfo/X86/byvalstruct.ll @@ -115,14 +115,14 @@ attributes #1 = { nounwind readnone } !25 = !{i32 1, !"Objective-C Image Info Version", i32 0} !26 = !{i32 1, !"Objective-C Image Info Section", !"__DATA, __objc_imageinfo, regular, no_dead_strip"} !27 = !{i32 4, !"Objective-C Garbage Collection", i32 0} -!28 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "self", line: 9, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !7, file: !5, type: !14) +!28 = !DILocalVariable(name: "self", line: 9, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !7, file: !5, type: !14) !29 = !DILocation(line: 9, scope: !7) -!30 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "_cmd", line: 9, arg: 2, flags: DIFlagArtificial, scope: !7, file: !5, type: !31) +!30 = !DILocalVariable(name: "_cmd", line: 9, arg: 2, flags: DIFlagArtificial, scope: !7, file: !5, type: !31) !31 = !DIDerivedType(tag: DW_TAG_typedef, name: "SEL", line: 9, file: !1, baseType: !12) -!32 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "otherBitmap", line: 9, arg: 3, scope: !7, file: !5, type: !14) -!33 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "info", line: 10, arg: 4, scope: !7, file: !5, type: !15) +!32 = !DILocalVariable(name: "otherBitmap", line: 9, arg: 3, scope: !7, file: !5, type: !14) +!33 = !DILocalVariable(name: "info", line: 10, arg: 4, scope: !7, file: !5, type: !15) !34 = !DILocation(line: 10, scope: !7) -!35 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "length", line: 11, arg: 5, scope: !7, file: !5, type: !19) +!35 = !DILocalVariable(name: "length", line: 11, arg: 5, scope: !7, file: !5, type: !19) !36 = !DILocation(line: 11, scope: !7) !37 = !DILocation(line: 13, scope: !7) !38 = !{i32 1, !"Debug Info Version", i32 3} diff --git a/llvm/test/DebugInfo/X86/concrete_out_of_line.ll b/llvm/test/DebugInfo/X86/concrete_out_of_line.ll index c1e1f750e2c..2d67e44cd30 100644 --- a/llvm/test/DebugInfo/X86/concrete_out_of_line.ll +++ b/llvm/test/DebugInfo/X86/concrete_out_of_line.ll @@ -94,13 +94,13 @@ declare void @_Z8moz_freePv(i8*) !17 = !{null, !10} !18 = !{} !20 = !{!22} -!22 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 14, arg: 1, flags: DIFlagArtificial, scope: !5, file: !6, type: !10) +!22 = !DILocalVariable(name: "this", line: 14, arg: 1, flags: DIFlagArtificial, scope: !5, file: !6, type: !10) !23 = !DISubprogram(name: "~nsAutoRefCnt", linkageName: "_ZN17nsAutoRefCntD1Ev", line: 18, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 18, file: !6, scope: null, type: !16, function: void ()* @_ZN17nsAutoRefCntD1Ev, declaration: !15, variables: !24) !24 = !{!26} -!26 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 18, arg: 1, flags: DIFlagArtificial, scope: !23, file: !6, type: !10) +!26 = !DILocalVariable(name: "this", line: 18, arg: 1, flags: DIFlagArtificial, scope: !23, file: !6, type: !10) !27 = !DISubprogram(name: "~nsAutoRefCnt", linkageName: "_ZN17nsAutoRefCntD2Ev", line: 18, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 18, file: !6, scope: null, type: !16, function: i32 ()* null, declaration: !15, variables: !28) !28 = !{!30} -!30 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 18, arg: 1, flags: DIFlagArtificial, scope: !27, file: !6, type: !10) +!30 = !DILocalVariable(name: "this", line: 18, arg: 1, flags: DIFlagArtificial, scope: !27, file: !6, type: !10) !31 = !DISubprogram(name: "operator=", linkageName: "_ZN12nsAutoRefCntaSEi", line: 4, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 4, file: !6, scope: null, type: !32, declaration: !36, variables: !43) !32 = !DISubroutineType(types: !33) !33 = !{!9, !34, !9} @@ -114,8 +114,8 @@ declare void @_Z8moz_freePv(i8*) !41 = !DISubroutineType(types: !42) !42 = !{null, !34} !43 = !{!45, !46} -!45 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 4, arg: 1, flags: DIFlagArtificial, scope: !31, file: !6, type: !34) -!46 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "aValue", line: 4, arg: 2, scope: !31, file: !6, type: !9) +!45 = !DILocalVariable(name: "this", line: 4, arg: 1, flags: DIFlagArtificial, scope: !31, file: !6, type: !34) +!46 = !DILocalVariable(name: "aValue", line: 4, arg: 2, scope: !31, file: !6, type: !9) !47 = !{!49} !49 = !DIGlobalVariable(name: "mRefCnt", line: 9, isLocal: false, isDefinition: true, scope: null, file: !6, type: !37, variable: i32* null) !50 = !DILocation(line: 5, column: 5, scope: !51, inlinedAt: !52) diff --git a/llvm/test/DebugInfo/X86/constant-aggregate.ll b/llvm/test/DebugInfo/X86/constant-aggregate.ll index daec3b4e7d6..8135873f715 100644 --- a/llvm/test/DebugInfo/X86/constant-aggregate.ll +++ b/llvm/test/DebugInfo/X86/constant-aggregate.ll @@ -90,17 +90,17 @@ attributes #1 = { nounwind readnone } !15 = !{!7, !16} !16 = !DIDerivedType(tag: DW_TAG_typedef, name: "S", line: 1, file: !1, baseType: !"_ZTS1S") !17 = !{!18} -!18 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "s", line: 3, arg: 1, scope: !12, file: !13, type: !16) +!18 = !DILocalVariable(name: "s", line: 3, arg: 1, scope: !12, file: !13, type: !16) !19 = !DISubprogram(name: "foo", linkageName: "_Z3foo1C", line: 10, isLocal: false, isDefinition: true, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 10, file: !1, scope: !13, type: !20, function: i32 (i32)* @_Z3foo1C, variables: !22) !20 = !DISubroutineType(types: !21) !21 = !{!7, !"_ZTS1C"} !22 = !{!23} -!23 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "c", line: 10, arg: 1, scope: !19, file: !13, type: !"_ZTS1C") +!23 = !DILocalVariable(name: "c", line: 10, arg: 1, scope: !19, file: !13, type: !"_ZTS1C") !24 = !DISubprogram(name: "bar", linkageName: "_Z3barv", line: 15, isLocal: false, isDefinition: true, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 15, file: !1, scope: !13, type: !25, function: i32 ()* @_Z3barv, variables: !27) !25 = !DISubroutineType(types: !26) !26 = !{!7} !27 = !{!28} -!28 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "a", line: 16, scope: !24, file: !13, type: !29) +!28 = !DILocalVariable(name: "a", line: 16, scope: !24, file: !13, type: !29) !29 = !DICompositeType(tag: DW_TAG_array_type, size: 32, align: 32, baseType: !30, elements: !31) !30 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !31 = !{!32} diff --git a/llvm/test/DebugInfo/X86/cu-ranges-odr.ll b/llvm/test/DebugInfo/X86/cu-ranges-odr.ll index 623e2fdd47a..7af6d9c5693 100644 --- a/llvm/test/DebugInfo/X86/cu-ranges-odr.ll +++ b/llvm/test/DebugInfo/X86/cu-ranges-odr.ll @@ -87,9 +87,9 @@ attributes #1 = { nounwind readnone } !24 = !{i32 1, !"Debug Info Version", i32 3} !25 = !{!"clang version 3.5 (trunk 199923) (llvm/trunk 199940)"} !26 = !DILocation(line: 8, scope: !14) -!27 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !18, type: !28) +!27 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !18, type: !28) !28 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !"_ZTS1A") !29 = !DILocation(line: 0, scope: !18) -!30 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "i", line: 3, arg: 2, scope: !18, file: !15, type: !7) +!30 = !DILocalVariable(name: "i", line: 3, arg: 2, scope: !18, file: !15, type: !7) !31 = !DILocation(line: 3, scope: !18) !32 = !DILocation(line: 3, scope: !19) diff --git a/llvm/test/DebugInfo/X86/cu-ranges.ll b/llvm/test/DebugInfo/X86/cu-ranges.ll index 5611a31cd5f..a8fd5c3ef8d 100644 --- a/llvm/test/DebugInfo/X86/cu-ranges.ll +++ b/llvm/test/DebugInfo/X86/cu-ranges.ll @@ -69,7 +69,7 @@ attributes #1 = { nounwind readnone } !10 = !{i32 2, !"Dwarf Version", i32 4} !11 = !{i32 1, !"Debug Info Version", i32 3} !12 = !{!"clang version 3.5.0 (trunk 204164) (llvm/trunk 204183)"} -!13 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "a", line: 1, arg: 1, scope: !4, file: !5, type: !8) +!13 = !DILocalVariable(name: "a", line: 1, arg: 1, scope: !4, file: !5, type: !8) !14 = !DILocation(line: 1, scope: !4) -!15 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "b", line: 2, arg: 1, scope: !9, file: !5, type: !8) +!15 = !DILocalVariable(name: "b", line: 2, arg: 1, scope: !9, file: !5, type: !8) !16 = !DILocation(line: 2, scope: !9) diff --git a/llvm/test/DebugInfo/X86/dbg-byval-parameter.ll b/llvm/test/DebugInfo/X86/dbg-byval-parameter.ll index a592884496a..ced7d1cc496 100644 --- a/llvm/test/DebugInfo/X86/dbg-byval-parameter.ll +++ b/llvm/test/DebugInfo/X86/dbg-byval-parameter.ll @@ -28,7 +28,7 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !llvm.dbg.cu = !{!3} !llvm.module.flags = !{!21} -!0 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "my_r0", line: 11, arg: 1, scope: !1, file: !2, type: !7) +!0 = !DILocalVariable(name: "my_r0", line: 11, arg: 1, scope: !1, file: !2, type: !7) !1 = !DISubprogram(name: "foo", linkageName: "foo", line: 11, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, file: !19, scope: !2, type: !4, function: double (%struct.Rect*)* @foo) !2 = !DIFile(filename: "b2.c", directory: "/tmp/") !3 = !DICompileUnit(language: DW_LANG_C89, producer: "4.2.1 (Based on Apple Inc. build 5658) (LLVM build)", isOptimized: false, emissionKind: 0, file: !19, enums: !20, retainedTypes: !20, subprograms: !18, imports: null) diff --git a/llvm/test/DebugInfo/X86/dbg-const-int.ll b/llvm/test/DebugInfo/X86/dbg-const-int.ll index 8482abf373e..cac74bbaad3 100644 --- a/llvm/test/DebugInfo/X86/dbg-const-int.ll +++ b/llvm/test/DebugInfo/X86/dbg-const-int.ll @@ -27,7 +27,7 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !3 = !DISubroutineType(types: !4) !4 = !{!5} !5 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -!6 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "i", line: 2, scope: !7, file: !2, type: !5) +!6 = !DILocalVariable(name: "i", line: 2, scope: !7, file: !2, type: !5) !7 = distinct !DILexicalBlock(line: 1, column: 11, file: !13, scope: !1) !8 = !{i32 42} !9 = !DILocation(line: 2, column: 12, scope: !7) diff --git a/llvm/test/DebugInfo/X86/dbg-const.ll b/llvm/test/DebugInfo/X86/dbg-const.ll index 27a0eabfe49..efd81bc6810 100644 --- a/llvm/test/DebugInfo/X86/dbg-const.ll +++ b/llvm/test/DebugInfo/X86/dbg-const.ll @@ -37,7 +37,7 @@ declare i32 @bar() nounwind readnone !3 = !DISubroutineType(types: !4) !4 = !{!5} !5 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -!6 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "j", line: 15, scope: !7, file: !1, type: !5) +!6 = !DILocalVariable(name: "j", line: 15, scope: !7, file: !1, type: !5) !7 = distinct !DILexicalBlock(line: 12, column: 52, file: !15, scope: !0) !8 = !{i32 42} !9 = !DILocation(line: 15, column: 12, scope: !7) diff --git a/llvm/test/DebugInfo/X86/dbg-declare-arg.ll b/llvm/test/DebugInfo/X86/dbg-declare-arg.ll index 85ff4b920ad..2b239f26dd8 100644 --- a/llvm/test/DebugInfo/X86/dbg-declare-arg.ll +++ b/llvm/test/DebugInfo/X86/dbg-declare-arg.ll @@ -98,9 +98,9 @@ entry: !23 = !DISubroutineType(types: !24) !24 = !{null} !25 = !DISubprogram(name: "~A", linkageName: "_ZN1AD2Ev", line: 2, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, file: !51, scope: !3, type: !23, function: void (%class.A*)* @_ZN1AD2Ev) -!26 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "i", line: 4, arg: 1, scope: !19, file: !3, type: !6) +!26 = !DILocalVariable(name: "i", line: 4, arg: 1, scope: !19, file: !3, type: !6) !27 = !DILocation(line: 4, column: 11, scope: !19) -!28 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "j", line: 5, scope: !29, file: !3, type: !6) +!28 = !DILocalVariable(name: "j", line: 5, scope: !29, file: !3, type: !6) !29 = distinct !DILexicalBlock(line: 4, column: 14, file: !51, scope: !19) !30 = !DILocation(line: 5, column: 7, scope: !29) !31 = !DILocation(line: 5, column: 12, scope: !29) @@ -109,16 +109,16 @@ entry: !34 = distinct !DILexicalBlock(line: 6, column: 16, file: !51, scope: !29) !35 = !DILocation(line: 8, column: 3, scope: !34) !36 = !DILocation(line: 9, column: 9, scope: !29) -!37 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "my_a", line: 9, scope: !29, file: !3, type: !38) +!37 = !DILocalVariable(name: "my_a", line: 9, scope: !29, file: !3, type: !38) !38 = !DIDerivedType(tag: DW_TAG_reference_type, file: !3, baseType: !1) !39 = !DILocation(line: 9, column: 5, scope: !29) !40 = !DILocation(line: 10, column: 3, scope: !29) !41 = !DILocation(line: 11, column: 3, scope: !29) !42 = !DILocation(line: 12, column: 1, scope: !29) -!43 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 2, arg: 1, flags: DIFlagArtificial, scope: !22, file: !3, type: !13) +!43 = !DILocalVariable(name: "this", line: 2, arg: 1, flags: DIFlagArtificial, scope: !22, file: !3, type: !13) !44 = !DILocation(line: 2, column: 47, scope: !22) !45 = !DILocation(line: 2, column: 61, scope: !22) -!46 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 2, arg: 1, flags: DIFlagArtificial, scope: !25, file: !3, type: !13) +!46 = !DILocalVariable(name: "this", line: 2, arg: 1, flags: DIFlagArtificial, scope: !25, file: !3, type: !13) !47 = !DILocation(line: 2, column: 47, scope: !25) !48 = !DILocation(line: 2, column: 54, scope: !49) !49 = distinct !DILexicalBlock(line: 2, column: 52, file: !51, scope: !25) diff --git a/llvm/test/DebugInfo/X86/dbg-declare.ll b/llvm/test/DebugInfo/X86/dbg-declare.ll index a1420a0ba2e..71b698e561e 100644 --- a/llvm/test/DebugInfo/X86/dbg-declare.ll +++ b/llvm/test/DebugInfo/X86/dbg-declare.ll @@ -40,11 +40,11 @@ declare void @llvm.stackrestore(i8*) nounwind !9 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !10 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !11) !11 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !9) -!14 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "x", line: 5, arg: 1, scope: !5, file: !6, type: !10) +!14 = !DILocalVariable(name: "x", line: 5, arg: 1, scope: !5, file: !6, type: !10) !15 = !DILocation(line: 5, column: 21, scope: !5) !16 = !DILocation(line: 7, column: 13, scope: !17) !17 = distinct !DILexicalBlock(line: 6, column: 1, file: !26, scope: !5) -!18 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "a", line: 7, scope: !17, file: !6, type: !19) +!18 = !DILocalVariable(name: "a", line: 7, scope: !17, file: !6, type: !19) !19 = !DICompositeType(tag: DW_TAG_array_type, align: 8, baseType: !20, elements: !21) !20 = !DIBasicType(tag: DW_TAG_base_type, name: "char", size: 8, align: 8, encoding: DW_ATE_signed_char) !21 = !{!22} diff --git a/llvm/test/DebugInfo/X86/dbg-i128-const.ll b/llvm/test/DebugInfo/X86/dbg-i128-const.ll index de804faabf4..f773786464c 100644 --- a/llvm/test/DebugInfo/X86/dbg-i128-const.ll +++ b/llvm/test/DebugInfo/X86/dbg-i128-const.ll @@ -17,7 +17,7 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !llvm.module.flags = !{!16} !0 = !{i128 42 } -!1 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "MAX", line: 29, scope: !2, file: !4, type: !8) +!1 = !DILocalVariable(name: "MAX", line: 29, scope: !2, file: !4, type: !8) !2 = distinct !DILexicalBlock(line: 26, column: 0, file: !13, scope: !3) !3 = !DISubprogram(name: "__foo", linkageName: "__foo", line: 26, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, scopeLine: 26, file: !13, scope: !4, type: !6, function: i128 (i128, i128)* @__foo) !4 = !DIFile(filename: "foo.c", directory: "/tmp") diff --git a/llvm/test/DebugInfo/X86/dbg-merge-loc-entry.ll b/llvm/test/DebugInfo/X86/dbg-merge-loc-entry.ll index bbcdd59a5b0..de4a2a41b1d 100644 --- a/llvm/test/DebugInfo/X86/dbg-merge-loc-entry.ll +++ b/llvm/test/DebugInfo/X86/dbg-merge-loc-entry.ll @@ -54,10 +54,10 @@ declare %0 @llvm.uadd.with.overflow.i64(i64, i64) nounwind readnone !11 = !{!12, !12, !12} !12 = !DIDerivedType(tag: DW_TAG_typedef, name: "TItype", line: 160, file: !30, scope: !6, baseType: !13) !13 = !DIBasicType(tag: DW_TAG_base_type, size: 128, align: 128, encoding: DW_ATE_signed) -!14 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "u", line: 1093, arg: 1, scope: !9, file: !1, type: !12) +!14 = !DILocalVariable(name: "u", line: 1093, arg: 1, scope: !9, file: !1, type: !12) !15 = !DILocation(line: 1093, scope: !9) !16 = !{i64 0} -!17 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "c", line: 1095, scope: !18, file: !1, type: !19) +!17 = !DILocalVariable(name: "c", line: 1095, scope: !18, file: !1, type: !19) !18 = distinct !DILexicalBlock(line: 1094, column: 0, file: !29, scope: !9) !19 = !DIDerivedType(tag: DW_TAG_typedef, name: "word_type", line: 424, file: !30, scope: !6, baseType: !20) !20 = !DIBasicType(tag: DW_TAG_base_type, name: "long int", size: 64, align: 64, encoding: DW_ATE_signed) diff --git a/llvm/test/DebugInfo/X86/dbg-prolog-end.ll b/llvm/test/DebugInfo/X86/dbg-prolog-end.ll index 870b09120bc..4dbeaa3eb9a 100644 --- a/llvm/test/DebugInfo/X86/dbg-prolog-end.ll +++ b/llvm/test/DebugInfo/X86/dbg-prolog-end.ll @@ -43,9 +43,9 @@ entry: !4 = !{!5} !5 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !6 = !DISubprogram(name: "main", line: 7, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, scopeLine: 7, file: !19, scope: !2, type: !3, function: i32 ()* @main) -!7 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "i", line: 1, arg: 1, scope: !1, file: !2, type: !5) +!7 = !DILocalVariable(name: "i", line: 1, arg: 1, scope: !1, file: !2, type: !5) !8 = !DILocation(line: 1, column: 13, scope: !1) -!9 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "j", line: 2, scope: !10, file: !2, type: !5) +!9 = !DILocalVariable(name: "j", line: 2, scope: !10, file: !2, type: !5) !10 = distinct !DILexicalBlock(line: 1, column: 16, file: !19, scope: !1) !11 = !DILocation(line: 2, column: 6, scope: !10) !12 = !DILocation(line: 2, column: 11, scope: !10) diff --git a/llvm/test/DebugInfo/X86/dbg-value-const-byref.ll b/llvm/test/DebugInfo/X86/dbg-value-const-byref.ll index a54ef0590e4..05eca6c39c7 100644 --- a/llvm/test/DebugInfo/X86/dbg-value-const-byref.ll +++ b/llvm/test/DebugInfo/X86/dbg-value-const-byref.ll @@ -88,7 +88,7 @@ attributes #3 = { nounwind } !7 = !{!8} !8 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !9 = !{!10} -!10 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "i", line: 6, scope: !4, file: !5, type: !8) +!10 = !DILocalVariable(name: "i", line: 6, scope: !4, file: !5, type: !8) !11 = !{i32 2, !"Dwarf Version", i32 2} !12 = !{i32 1, !"Debug Info Version", i32 3} !13 = !{!"clang version 3.5.0 "} diff --git a/llvm/test/DebugInfo/X86/dbg-value-dag-combine.ll b/llvm/test/DebugInfo/X86/dbg-value-dag-combine.ll index e73d161ecb7..e4fcdefad7b 100644 --- a/llvm/test/DebugInfo/X86/dbg-value-dag-combine.ll +++ b/llvm/test/DebugInfo/X86/dbg-value-dag-combine.ll @@ -31,13 +31,13 @@ entry: !4 = !{null, !5} !5 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 32, align: 32, scope: !2, baseType: !6) !6 = !DIBasicType(tag: DW_TAG_base_type, name: "unsigned int", size: 32, align: 32, encoding: DW_ATE_unsigned) -!7 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "ip", line: 1, arg: 1, scope: !0, file: !1, type: !5) +!7 = !DILocalVariable(name: "ip", line: 1, arg: 1, scope: !0, file: !1, type: !5) !8 = !DILocation(line: 1, column: 42, scope: !0) -!9 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "gid", line: 3, scope: !10, file: !1, type: !6) +!9 = !DILocalVariable(name: "gid", line: 3, scope: !10, file: !1, type: !6) !10 = distinct !DILexicalBlock(line: 2, column: 1, file: !19, scope: !0) !11 = !DILocation(line: 3, column: 41, scope: !10) !12 = !{} -!13 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "idx", line: 4, scope: !10, file: !1, type: !6) +!13 = !DILocalVariable(name: "idx", line: 4, scope: !10, file: !1, type: !6) !14 = !DILocation(line: 4, column: 20, scope: !10) !15 = !DILocation(line: 5, column: 15, scope: !10) !16 = !DILocation(line: 6, column: 18, scope: !10) diff --git a/llvm/test/DebugInfo/X86/dbg-value-inlined-parameter.ll b/llvm/test/DebugInfo/X86/dbg-value-inlined-parameter.ll index 3fa5cc5a98a..f08e94ed571 100644 --- a/llvm/test/DebugInfo/X86/dbg-value-inlined-parameter.ll +++ b/llvm/test/DebugInfo/X86/dbg-value-inlined-parameter.ll @@ -83,7 +83,7 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !6 = !DISubprogram(name: "foobar", line: 15, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: true, file: !1, scope: !1, type: !7, function: void ()* @foobar) !7 = !DISubroutineType(types: !8) !8 = !{null} -!9 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "sp", line: 7, arg: 1, scope: !0, file: !1, type: !10) +!9 = !DILocalVariable(name: "sp", line: 7, arg: 1, scope: !0, file: !1, type: !10) !10 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, scope: !2, baseType: !11) !11 = !DIDerivedType(tag: DW_TAG_typedef, name: "S1", line: 4, file: !42, scope: !2, baseType: !12) !12 = !DICompositeType(tag: DW_TAG_structure_type, name: "S1", line: 1, size: 128, align: 64, file: !42, scope: !2, elements: !13) @@ -92,7 +92,7 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !15 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, scope: !2, baseType: !16) !16 = !DIBasicType(tag: DW_TAG_base_type, name: "float", size: 32, align: 32, encoding: DW_ATE_float) !17 = !DIDerivedType(tag: DW_TAG_member, name: "nums", line: 3, size: 32, align: 32, offset: 64, file: !42, scope: !1, baseType: !5) -!18 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "nums", line: 7, arg: 2, scope: !0, file: !1, type: !5) +!18 = !DILocalVariable(name: "nums", line: 7, arg: 2, scope: !0, file: !1, type: !5) !19 = !DIGlobalVariable(name: "p", line: 14, isLocal: false, isDefinition: true, scope: !2, file: !1, type: !11, variable: %struct.S1* @p) !20 = !DILocation(line: 7, column: 13, scope: !0) !21 = !DILocation(line: 7, column: 21, scope: !0) diff --git a/llvm/test/DebugInfo/X86/dbg-value-isel.ll b/llvm/test/DebugInfo/X86/dbg-value-isel.ll index 9d5a8b76ac4..557836b4e19 100644 --- a/llvm/test/DebugInfo/X86/dbg-value-isel.ll +++ b/llvm/test/DebugInfo/X86/dbg-value-isel.ll @@ -89,14 +89,14 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !5 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 32, align: 32, scope: !2, baseType: !6) !6 = !DIDerivedType(tag: DW_TAG_typedef, name: "uint", file: !20, scope: !2, baseType: !7) !7 = !DIBasicType(tag: DW_TAG_base_type, name: "unsigned int", size: 32, align: 32, encoding: DW_ATE_unsigned) -!8 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "ip", line: 1, arg: 1, scope: !0, file: !1, type: !5) +!8 = !DILocalVariable(name: "ip", line: 1, arg: 1, scope: !0, file: !1, type: !5) !9 = !DILocation(line: 1, column: 32, scope: !0) -!10 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "tid", line: 3, scope: !11, file: !1, type: !6) +!10 = !DILocalVariable(name: "tid", line: 3, scope: !11, file: !1, type: !6) !11 = distinct !DILexicalBlock(line: 2, column: 1, file: !1, scope: !0) !12 = !DILocation(line: 5, column: 24, scope: !11) -!13 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "gid", line: 3, scope: !11, file: !1, type: !6) +!13 = !DILocalVariable(name: "gid", line: 3, scope: !11, file: !1, type: !6) !14 = !DILocation(line: 6, column: 25, scope: !11) -!15 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "lsz", line: 3, scope: !11, file: !1, type: !6) +!15 = !DILocalVariable(name: "lsz", line: 3, scope: !11, file: !1, type: !6) !16 = !DILocation(line: 7, column: 26, scope: !11) !17 = !DILocation(line: 9, column: 24, scope: !11) !18 = !DILocation(line: 10, column: 1, scope: !0) diff --git a/llvm/test/DebugInfo/X86/dbg-value-location.ll b/llvm/test/DebugInfo/X86/dbg-value-location.ll index 631c05e1844..e9628e0a86e 100644 --- a/llvm/test/DebugInfo/X86/dbg-value-location.ll +++ b/llvm/test/DebugInfo/X86/dbg-value-location.ll @@ -62,7 +62,7 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !9 = !DISubroutineType(types: !10) !10 = !{!11} !11 = !DIBasicType(tag: DW_TAG_base_type, name: "unsigned char", size: 8, align: 8, encoding: DW_ATE_unsigned_char) -!12 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "var", line: 19509, arg: 1, scope: !0, file: !1, type: !5) +!12 = !DILocalVariable(name: "var", line: 19509, arg: 1, scope: !0, file: !1, type: !5) !13 = !DILocation(line: 19509, column: 20, scope: !0) !14 = !DILocation(line: 18091, column: 2, scope: !15, inlinedAt: !17) !15 = distinct !DILexicalBlock(line: 18086, column: 1, file: !26, scope: !16) diff --git a/llvm/test/DebugInfo/X86/dbg-value-range.ll b/llvm/test/DebugInfo/X86/dbg-value-range.ll index b7d5d520add..da836233deb 100644 --- a/llvm/test/DebugInfo/X86/dbg-value-range.ll +++ b/llvm/test/DebugInfo/X86/dbg-value-range.ll @@ -26,12 +26,12 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !3 = !DISubroutineType(types: !4) !4 = !{!5} !5 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -!6 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "b", line: 5, arg: 1, scope: !0, file: !1, type: !7) +!6 = !DILocalVariable(name: "b", line: 5, arg: 1, scope: !0, file: !1, type: !7) !7 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, scope: !2, baseType: !8) !8 = !DICompositeType(tag: DW_TAG_structure_type, name: "a", line: 1, size: 32, align: 32, file: !22, scope: !2, elements: !9) !9 = !{!10} !10 = !DIDerivedType(tag: DW_TAG_member, name: "c", line: 2, size: 32, align: 32, file: !22, scope: !1, baseType: !5) -!11 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "x", line: 6, scope: !12, file: !1, type: !5) +!11 = !DILocalVariable(name: "x", line: 6, scope: !12, file: !1, type: !5) !12 = distinct !DILexicalBlock(line: 5, column: 22, file: !22, scope: !0) !13 = !DILocation(line: 5, column: 19, scope: !0) !14 = !DILocation(line: 6, column: 14, scope: !12) diff --git a/llvm/test/DebugInfo/X86/dbg-value-terminator.ll b/llvm/test/DebugInfo/X86/dbg-value-terminator.ll index 5f50b13aa02..26da1e679bb 100644 --- a/llvm/test/DebugInfo/X86/dbg-value-terminator.ll +++ b/llvm/test/DebugInfo/X86/dbg-value-terminator.ll @@ -119,11 +119,11 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !3 = !DISubroutineType(types: !4) !4 = !{!5} !5 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -!6 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "i", line: 2, arg: 1, scope: !1, file: !2, type: !5) -!7 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "c", line: 2, arg: 2, scope: !1, file: !2, type: !8) +!6 = !DILocalVariable(name: "i", line: 2, arg: 1, scope: !1, file: !2, type: !5) +!7 = !DILocalVariable(name: "c", line: 2, arg: 2, scope: !1, file: !2, type: !8) !8 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, scope: !0, baseType: !9) !9 = !DIBasicType(tag: DW_TAG_base_type, name: "char", size: 8, align: 8, encoding: DW_ATE_signed_char) -!10 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "a", line: 3, scope: !11, file: !2, type: !9) +!10 = !DILocalVariable(name: "a", line: 3, scope: !11, file: !2, type: !9) !11 = distinct !DILexicalBlock(line: 2, column: 25, file: !20, scope: !1) !12 = !DILocation(line: 2, column: 13, scope: !1) !18 = !{!1} diff --git a/llvm/test/DebugInfo/X86/dbg_value_direct.ll b/llvm/test/DebugInfo/X86/dbg_value_direct.ll index 6446dfe491a..dd208a27d09 100644 --- a/llvm/test/DebugInfo/X86/dbg_value_direct.ll +++ b/llvm/test/DebugInfo/X86/dbg_value_direct.ll @@ -168,8 +168,8 @@ attributes #2 = { "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "n !19 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !8) !21 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !22 = !{i32 2, !"Dwarf Version", i32 3} -!23 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "", line: 6, arg: 1, scope: !4, file: !5, type: !21) -!24 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "a", line: 7, scope: !4, file: !5, type: !8) +!23 = !DILocalVariable(name: "", line: 6, arg: 1, scope: !4, file: !5, type: !21) +!24 = !DILocalVariable(name: "a", line: 7, scope: !4, file: !5, type: !8) !25 = !DILocation(line: 7, scope: !4) !26 = !DILocation(line: 8, scope: !4) !27 = !{i32 1, !"Debug Info Version", i32 3} diff --git a/llvm/test/DebugInfo/X86/debug-dead-local-var.ll b/llvm/test/DebugInfo/X86/debug-dead-local-var.ll index d56d17d06e6..ea8c6896fe2 100644 --- a/llvm/test/DebugInfo/X86/debug-dead-local-var.ll +++ b/llvm/test/DebugInfo/X86/debug-dead-local-var.ll @@ -40,7 +40,7 @@ attributes #0 = { nounwind readnone uwtable "less-precise-fpmad"="false" "no-fra !10 = !DISubroutineType(types: !11) !11 = !{null} !12 = !{!13} -!13 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "xyz", line: 8, scope: !9, file: !5, type: !14) +!13 = !DILocalVariable(name: "xyz", line: 8, scope: !9, file: !5, type: !14) !14 = !DICompositeType(tag: DW_TAG_structure_type, name: "X", line: 8, size: 64, align: 32, file: !1, scope: !9, elements: !15) !15 = !{!16, !17} !16 = !DIDerivedType(tag: DW_TAG_member, name: "a", line: 8, size: 32, align: 32, file: !1, scope: !14, baseType: !8) diff --git a/llvm/test/DebugInfo/X86/debug-info-block-captured-self.ll b/llvm/test/DebugInfo/X86/debug-info-block-captured-self.ll index e79b093d031..c5cb0563c45 100644 --- a/llvm/test/DebugInfo/X86/debug-info-block-captured-self.ll +++ b/llvm/test/DebugInfo/X86/debug-info-block-captured-self.ll @@ -101,10 +101,10 @@ define internal void @"__24-[Main initWithContext:]_block_invoke_2"(i8* %.block_ !41 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: null) !42 = !DISubprogram(name: "__24-[Main initWithContext:]_block_invoke_2", line: 35, isLocal: true, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 35, file: !1, scope: !1, type: !39, function: void (i8*, i8*)* @"__24-[Main initWithContext:]_block_invoke_2", variables: !15) !84 = !DILocation(line: 33, scope: !38) -!86 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "self", line: 41, scope: !38, file: !1, type: !34) +!86 = !DILocalVariable(name: "self", line: 41, scope: !38, file: !1, type: !34) !87 = !DILocation(line: 41, scope: !38) !103 = !DILocation(line: 35, scope: !42) -!105 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "self", line: 40, scope: !42, file: !1, type: !34) +!105 = !DILocalVariable(name: "self", line: 40, scope: !42, file: !1, type: !34) !106 = !DILocation(line: 40, scope: !42) !107 = !DIFile(filename: "llvm/tools/clang/test/CodeGenObjC/debug-info-block-captured-self.m", directory: "") !108 = !{i32 1, !"Debug Info Version", i32 3} diff --git a/llvm/test/DebugInfo/X86/debug-info-blocks.ll b/llvm/test/DebugInfo/X86/debug-info-blocks.ll index a9aadfdb731..47534709aa4 100644 --- a/llvm/test/DebugInfo/X86/debug-info-blocks.ll +++ b/llvm/test/DebugInfo/X86/debug-info-blocks.ll @@ -330,10 +330,10 @@ attributes #3 = { nounwind } !57 = !{i32 1, !"Objective-C Image Info Version", i32 0} !58 = !{i32 1, !"Objective-C Image Info Section", !"__DATA, __objc_imageinfo, regular, no_dead_strip"} !59 = !{i32 4, !"Objective-C Garbage Collection", i32 0} -!60 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "self", line: 46, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !13, file: !32, type: !61) +!60 = !DILocalVariable(name: "self", line: 46, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !13, file: !32, type: !61) !61 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !4) !62 = !DILocation(line: 46, scope: !13) -!63 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "_cmd", line: 46, arg: 2, flags: DIFlagArtificial, scope: !13, file: !32, type: !64) +!63 = !DILocalVariable(name: "_cmd", line: 46, arg: 2, flags: DIFlagArtificial, scope: !13, file: !32, type: !64) !64 = !DIDerivedType(tag: DW_TAG_typedef, name: "SEL", line: 46, file: !5, baseType: !25) !65 = !DILocation(line: 48, scope: !66) !66 = distinct !DILexicalBlock(line: 47, column: 0, file: !5, scope: !13) @@ -342,11 +342,11 @@ attributes #3 = { nounwind } !69 = distinct !DILexicalBlock(line: 48, column: 0, file: !5, scope: !66) !70 = !DILocation(line: 53, scope: !69) !71 = !DILocation(line: 54, scope: !66) -!72 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "block", line: 39, arg: 1, scope: !39, file: !6, type: !42) +!72 = !DILocalVariable(name: "block", line: 39, arg: 1, scope: !39, file: !6, type: !42) !73 = !DILocation(line: 39, scope: !39) !74 = !DILocation(line: 41, scope: !39) !75 = !DILocation(line: 42, scope: !39) -!76 = !DILocalVariable(tag: DW_TAG_arg_variable, name: ".block_descriptor", line: 49, arg: 1, flags: DIFlagArtificial, scope: !27, file: !6, type: !77) +!76 = !DILocalVariable(name: ".block_descriptor", line: 49, arg: 1, flags: DIFlagArtificial, scope: !27, file: !6, type: !77) !77 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, baseType: !78) !78 = !DICompositeType(tag: DW_TAG_structure_type, name: "__block_literal_1", line: 49, size: 320, align: 64, file: !5, scope: !6, elements: !79) !79 = !{!80, !81, !82, !83, !84, !87} @@ -359,9 +359,9 @@ attributes #3 = { nounwind } !86 = !DICompositeType(tag: DW_TAG_structure_type, name: "__block_descriptor_withcopydispose", line: 49, flags: DIFlagFwdDecl, file: !1) !87 = !DIDerivedType(tag: DW_TAG_member, name: "self", line: 49, size: 64, align: 64, offset: 256, file: !5, scope: !6, baseType: !61) !88 = !DILocation(line: 49, scope: !27) -!89 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "self", line: 52, scope: !27, file: !32, type: !23) +!89 = !DILocalVariable(name: "self", line: 52, scope: !27, file: !32, type: !23) !90 = !DILocation(line: 52, scope: !27) -!91 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "d", line: 50, scope: !92, file: !6, type: !93) +!91 = !DILocalVariable(name: "d", line: 50, scope: !92, file: !6, type: !93) !92 = distinct !DILexicalBlock(line: 49, column: 0, file: !5, scope: !27) !93 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !94) !94 = !DICompositeType(tag: DW_TAG_structure_type, name: "NSMutableDictionary", line: 30, align: 8, runtimeLang: DW_LANG_ObjC, file: !5, scope: !6, elements: !95) @@ -372,12 +372,12 @@ attributes #3 = { nounwind } !99 = !DIDerivedType(tag: DW_TAG_inheritance, scope: !97, baseType: !9) !100 = !DILocation(line: 50, scope: !92) !101 = !DILocation(line: 51, scope: !92) -!102 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "", line: 52, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !31, file: !32, type: !30) +!102 = !DILocalVariable(name: "", line: 52, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !31, file: !32, type: !30) !103 = !DILocation(line: 52, scope: !31) -!104 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "", line: 52, arg: 2, flags: DIFlagArtificial, scope: !31, file: !32, type: !30) -!105 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "", line: 52, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !35, file: !32, type: !30) +!104 = !DILocalVariable(name: "", line: 52, arg: 2, flags: DIFlagArtificial, scope: !31, file: !32, type: !30) +!105 = !DILocalVariable(name: "", line: 52, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !35, file: !32, type: !30) !106 = !DILocation(line: 52, scope: !35) -!107 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "a", line: 61, scope: !36, file: !6, type: !61) +!107 = !DILocalVariable(name: "a", line: 61, scope: !36, file: !6, type: !61) !108 = !DILocation(line: 61, scope: !36) !109 = !DILocation(line: 62, scope: !36) !110 = !{i32 1, !"Debug Info Version", i32 3} diff --git a/llvm/test/DebugInfo/X86/debug-info-static-member.ll b/llvm/test/DebugInfo/X86/debug-info-static-member.ll index 1dc85b95487..bd7f6346f61 100644 --- a/llvm/test/DebugInfo/X86/debug-info-static-member.ll +++ b/llvm/test/DebugInfo/X86/debug-info-static-member.ll @@ -85,7 +85,7 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !26 = !DIDerivedType(tag: DW_TAG_member, name: "d", line: 11, size: 32, align: 32, flags: DIFlagPublic, file: !33, scope: !13, baseType: !9) !27 = !DIGlobalVariable(name: "b", linkageName: "_ZN1C1bE", line: 15, isLocal: false, isDefinition: true, scope: null, file: !6, type: !9, variable: i32* @_ZN1C1bE, declaration: !19) !28 = !DIGlobalVariable(name: "c", linkageName: "_ZN1C1cE", line: 16, isLocal: false, isDefinition: true, scope: null, file: !6, type: !9, variable: i32* @_ZN1C1cE, declaration: !23) -!29 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "instance_C", line: 20, scope: !5, file: !6, type: !13) +!29 = !DILocalVariable(name: "instance_C", line: 20, scope: !5, file: !6, type: !13) !30 = !DILocation(line: 20, scope: !5) !31 = !DILocation(line: 21, scope: !5) !32 = !DILocation(line: 22, scope: !5) diff --git a/llvm/test/DebugInfo/X86/debug-loc-asan.ll b/llvm/test/DebugInfo/X86/debug-loc-asan.ll index 68bef490480..c187b54e4cf 100644 --- a/llvm/test/DebugInfo/X86/debug-loc-asan.ll +++ b/llvm/test/DebugInfo/X86/debug-loc-asan.ll @@ -177,6 +177,6 @@ attributes #1 = { nounwind readnone } !9 = !{i32 2, !"Dwarf Version", i32 4} !10 = !{i32 2, !"Debug Info Version", i32 3} !11 = !{!"clang version 3.5.0 (209308)"} -!12 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "y", line: 1, arg: 1, scope: !4, file: !5, type: !8) +!12 = !DILocalVariable(name: "y", line: 1, arg: 1, scope: !4, file: !5, type: !8) !13 = !DILocation(line: 2, scope: !4) !14 = !DIExpression(DW_OP_deref) diff --git a/llvm/test/DebugInfo/X86/debug-loc-empty-entries.ll b/llvm/test/DebugInfo/X86/debug-loc-empty-entries.ll index 3b997fd35e0..40dcdce18f5 100644 --- a/llvm/test/DebugInfo/X86/debug-loc-empty-entries.ll +++ b/llvm/test/DebugInfo/X86/debug-loc-empty-entries.ll @@ -53,7 +53,7 @@ attributes #1 = { nounwind readnone } !6 = !DISubroutineType(types: !7) !7 = !{null} !8 = !{!9} -!9 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "a", scope: !4, file: !5, line: 2, type: !10) +!9 = !DILocalVariable(name: "a", scope: !4, file: !5, line: 2, type: !10) !10 = !DIBasicType(name: "float", size: 32, align: 32, encoding: DW_ATE_float) !11 = !{i32 2, !"Dwarf Version", i32 4} !12 = !{i32 2, !"Debug Info Version", i32 3} diff --git a/llvm/test/DebugInfo/X86/debug-loc-offset.ll b/llvm/test/DebugInfo/X86/debug-loc-offset.ll index cf2fcc8e222..f2a55563c08 100644 --- a/llvm/test/DebugInfo/X86/debug-loc-offset.ll +++ b/llvm/test/DebugInfo/X86/debug-loc-offset.ll @@ -137,12 +137,12 @@ attributes #2 = { "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "n !18 = !{i32 2, !"Dwarf Version", i32 4} !19 = !{i32 2, !"Debug Info Version", i32 3} !20 = !{!"clang version 3.5.0 (210479)"} -!21 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "b", line: 1, arg: 1, scope: !4, file: !5, type: !8) +!21 = !DILocalVariable(name: "b", line: 1, arg: 1, scope: !4, file: !5, type: !8) !22 = !DILocation(line: 1, scope: !4) !23 = !DILocation(line: 2, scope: !4) -!24 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "a", line: 6, arg: 1, scope: !14, file: !15, type: !"_ZTS1A") +!24 = !DILocalVariable(name: "a", line: 6, arg: 1, scope: !14, file: !15, type: !"_ZTS1A") !25 = !DILocation(line: 6, scope: !14) -!26 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "z", line: 7, scope: !14, file: !15, type: !8) +!26 = !DILocalVariable(name: "z", line: 7, scope: !14, file: !15, type: !8) !27 = !DILocation(line: 7, scope: !14) !28 = !DILocation(line: 8, scope: !29) !29 = distinct !DILexicalBlock(line: 8, column: 0, file: !10, scope: !14) diff --git a/llvm/test/DebugInfo/X86/debug-ranges-offset.ll b/llvm/test/DebugInfo/X86/debug-ranges-offset.ll index 19c3bcf3748..711cca15bed 100644 --- a/llvm/test/DebugInfo/X86/debug-ranges-offset.ll +++ b/llvm/test/DebugInfo/X86/debug-ranges-offset.ll @@ -211,7 +211,7 @@ attributes #4 = { builtin } !6 = !DISubroutineType(types: !7) !7 = !{null} !8 = !{!9} -!9 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "p", line: 4, scope: !4, file: !5, type: !10) +!9 = !DILocalVariable(name: "p", line: 4, scope: !4, file: !5, type: !10) !10 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !11) !11 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !12) !12 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) @@ -234,7 +234,7 @@ attributes #4 = { builtin } !29 = !DILocation(line: 7, scope: !4) !30 = !DILocation(line: 4, scope: !4, inlinedAt: !31) !31 = !DILocation(line: 10, scope: !13) -!32 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "p", line: 4, scope: !4, file: !5, type: !10) +!32 = !DILocalVariable(name: "p", line: 4, scope: !4, file: !5, type: !10) !33 = !DILocation(line: 5, scope: !21, inlinedAt: !31) !34 = !DILocation(line: 6, scope: !21, inlinedAt: !31) !35 = !DILocation(line: 7, scope: !4, inlinedAt: !31) diff --git a/llvm/test/DebugInfo/X86/decl-derived-member.ll b/llvm/test/DebugInfo/X86/decl-derived-member.ll index 3b833580e9c..0dffcb5f04e 100644 --- a/llvm/test/DebugInfo/X86/decl-derived-member.ll +++ b/llvm/test/DebugInfo/X86/decl-derived-member.ll @@ -134,17 +134,17 @@ attributes #4 = { "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "n !31 = !{i32 2, !"Debug Info Version", i32 3} !32 = !{!"clang version 3.7.0 (trunk 227104) (llvm/trunk 227103)"} !33 = !DILocation(line: 8, column: 5, scope: !10) -!34 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !14, type: !35) +!34 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !14, type: !35) !35 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !"_ZTS3foo") !36 = !DIExpression() !37 = !DILocation(line: 0, scope: !14) !38 = !DILocation(line: 5, column: 8, scope: !14) -!39 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !24, type: !35) +!39 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !24, type: !35) !40 = !DILocation(line: 0, scope: !24) !41 = !DILocation(line: 5, column: 8, scope: !42) !42 = distinct !DILexicalBlock(line: 5, column: 8, file: !1, scope: !24) !43 = !DILocation(line: 5, column: 8, scope: !24) -!44 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !19, type: !45) +!44 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !19, type: !45) !45 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !"_ZTS4base") !46 = !DILocation(line: 0, scope: !19) !47 = !DILocation(line: 1, column: 8, scope: !19) diff --git a/llvm/test/DebugInfo/X86/deleted-bit-piece.ll b/llvm/test/DebugInfo/X86/deleted-bit-piece.ll index 63f3be5ea41..1ee8a080ad0 100644 --- a/llvm/test/DebugInfo/X86/deleted-bit-piece.ll +++ b/llvm/test/DebugInfo/X86/deleted-bit-piece.ll @@ -41,6 +41,6 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) !12 = !DISubprogram(name: "foo", scope: null, file: !3, type: !13, isLocal: false, isDefinition: true, isOptimized: false, function: void ()* @_Z3foov) !13 = !DISubroutineType(types: !14) !14 = !{null} -!15 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "v", scope: !12, type: !"_ZT5Class") +!15 = !DILocalVariable(name: "v", scope: !12, type: !"_ZT5Class") !16 = !DIExpression(DW_OP_bit_piece, 32, 32) !17 = !DILocation(line: 2755, column: 9, scope: !12) diff --git a/llvm/test/DebugInfo/X86/dwarf-aranges-no-dwarf-labels.ll b/llvm/test/DebugInfo/X86/dwarf-aranges-no-dwarf-labels.ll index aae155414bd..1cde07a29af 100644 --- a/llvm/test/DebugInfo/X86/dwarf-aranges-no-dwarf-labels.ll +++ b/llvm/test/DebugInfo/X86/dwarf-aranges-no-dwarf-labels.ll @@ -70,10 +70,10 @@ attributes #2 = { nounwind readnone } !7 = !{!8, !8} !8 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !9 = !{!10} -!10 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "bar", line: 2, arg: 1, scope: !4, file: !5, type: !8) +!10 = !DILocalVariable(name: "bar", line: 2, arg: 1, scope: !4, file: !5, type: !8) !11 = !DISubprogram(name: "foo2", linkageName: "_Z4foo2i", line: 3, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 3, file: !1, scope: !5, type: !6, function: i32 (i32)* @_Z4foo2i, variables: !12) !12 = !{!13} -!13 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "bar2", line: 3, arg: 1, scope: !11, file: !5, type: !8) +!13 = !DILocalVariable(name: "bar2", line: 3, arg: 1, scope: !11, file: !5, type: !8) !14 = !DISubprogram(name: "main", line: 5, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 5, file: !1, scope: !5, type: !15, function: i32 ()* @main, variables: !2) !15 = !DISubroutineType(types: !16) !16 = !{!8} diff --git a/llvm/test/DebugInfo/X86/dwarf-public-names.ll b/llvm/test/DebugInfo/X86/dwarf-public-names.ll index c72da38832e..4458d045787 100644 --- a/llvm/test/DebugInfo/X86/dwarf-public-names.ll +++ b/llvm/test/DebugInfo/X86/dwarf-public-names.ll @@ -124,7 +124,7 @@ attributes #1 = { nounwind readnone } !25 = !DIGlobalVariable(name: "static_member_variable", linkageName: "_ZN1C22static_member_variableE", line: 7, isLocal: false, isDefinition: true, scope: !8, file: !4, type: !11, variable: i32* @_ZN1C22static_member_variableE, declaration: !10) !26 = !DIGlobalVariable(name: "global_variable", line: 17, isLocal: false, isDefinition: true, scope: null, file: !4, type: !8, variable: %struct.C* @global_variable) !27 = !DIGlobalVariable(name: "global_namespace_variable", linkageName: "_ZN2ns25global_namespace_variableE", line: 27, isLocal: false, isDefinition: true, scope: !21, file: !4, type: !11, variable: i32* @_ZN2ns25global_namespace_variableE) -!28 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 9, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !3, file: !4, type: !29) +!28 = !DILocalVariable(name: "this", line: 9, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !3, file: !4, type: !29) !29 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !8) !30 = !DILocation(line: 9, scope: !3) !31 = !DILocation(line: 10, scope: !3) diff --git a/llvm/test/DebugInfo/X86/earlydup-crash.ll b/llvm/test/DebugInfo/X86/earlydup-crash.ll index 738b7194488..99f560399af 100644 --- a/llvm/test/DebugInfo/X86/earlydup-crash.ll +++ b/llvm/test/DebugInfo/X86/earlydup-crash.ll @@ -44,7 +44,7 @@ declare void @foobar(i32) !llvm.dbg.cu = !{!4} !llvm.module.flags = !{!47} -!0 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "frname_len", line: 517, scope: !1, file: !3, type: !38) +!0 = !DILocalVariable(name: "frname_len", line: 517, scope: !1, file: !3, type: !38) !1 = distinct !DILexicalBlock(line: 515, column: 0, file: !44, scope: !2) !2 = !DISubprogram(name: "framework_construct_pathname", line: 515, isLocal: true, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: true, file: !44, scope: null, type: !5, function: i8* (i8*, %struct.cpp_dir*)* @framework_construct_pathname) !3 = !DIFile(filename: "darwin-c.c", directory: "/Users/espindola/llvm/build-llvm-gcc/gcc/../../llvm-gcc-4.2/gcc/config") diff --git a/llvm/test/DebugInfo/X86/elf-names.ll b/llvm/test/DebugInfo/X86/elf-names.ll index e4565c27cf7..b2d188290d0 100644 --- a/llvm/test/DebugInfo/X86/elf-names.ll +++ b/llvm/test/DebugInfo/X86/elf-names.ll @@ -84,12 +84,12 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !23 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !24) !24 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !10) !27 = !{!29} -!29 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 12, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !5, file: !6, type: !30) +!29 = !DILocalVariable(name: "this", line: 12, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !5, file: !6, type: !30) !30 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !10) !31 = !DISubprogram(name: "D", linkageName: "_ZN1DC2ERKS_", line: 19, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 19, file: !6, scope: null, type: !21, function: void (%class.D*, %class.D*)* @_ZN1DC2ERKS_, declaration: !20, variables: !32) !32 = !{!34, !35} -!34 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 19, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !31, file: !6, type: !30) -!35 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "d", line: 19, arg: 2, scope: !31, file: !6, type: !23) +!34 = !DILocalVariable(name: "this", line: 19, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !31, file: !6, type: !30) +!35 = !DILocalVariable(name: "d", line: 19, arg: 2, scope: !31, file: !6, type: !23) !36 = !DILocation(line: 12, scope: !5) !37 = !DILocation(line: 13, scope: !38) !38 = distinct !DILexicalBlock(line: 12, column: 0, file: !6, scope: !5) diff --git a/llvm/test/DebugInfo/X86/empty-and-one-elem-array.ll b/llvm/test/DebugInfo/X86/empty-and-one-elem-array.ll index 1250b9c6441..4ad9d9c18bd 100644 --- a/llvm/test/DebugInfo/X86/empty-and-one-elem-array.ll +++ b/llvm/test/DebugInfo/X86/empty-and-one-elem-array.ll @@ -71,7 +71,7 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !7 = !DISubroutineType(types: !8) !8 = !{!9} !9 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -!10 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "my_foo", line: 12, scope: !11, file: !6, type: !12) +!10 = !DILocalVariable(name: "my_foo", line: 12, scope: !11, file: !6, type: !12) !11 = distinct !DILexicalBlock(line: 11, column: 0, file: !6, scope: !5) !12 = !DICompositeType(tag: DW_TAG_structure_type, name: "foo", line: 1, size: 64, align: 32, file: !32, elements: !13) !13 = !{!14, !15} @@ -81,7 +81,7 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !17 = !{!18} !18 = !DISubrange(count: 1) !19 = !DILocation(line: 12, scope: !11) -!20 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "my_bar", line: 13, scope: !11, file: !6, type: !21) +!20 = !DILocalVariable(name: "my_bar", line: 13, scope: !11, file: !6, type: !21) !21 = !DICompositeType(tag: DW_TAG_structure_type, name: "bar", line: 6, size: 32, align: 32, file: !32, elements: !22) !22 = !{!23, !24} !23 = !DIDerivedType(tag: DW_TAG_member, name: "a", line: 7, size: 32, align: 32, file: !32, scope: !21, baseType: !9) diff --git a/llvm/test/DebugInfo/X86/ending-run.ll b/llvm/test/DebugInfo/X86/ending-run.ll index 9e3584615df..60c395fc835 100644 --- a/llvm/test/DebugInfo/X86/ending-run.ll +++ b/llvm/test/DebugInfo/X86/ending-run.ll @@ -37,9 +37,9 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !7 = !DISubroutineType(types: !8) !8 = !{!9, !9} !9 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -!12 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "x", line: 5, arg: 1, scope: !5, file: !6, type: !9) +!12 = !DILocalVariable(name: "x", line: 5, arg: 1, scope: !5, file: !6, type: !9) !13 = !DILocation(line: 5, column: 5, scope: !5) -!14 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "y", line: 8, scope: !15, file: !6, type: !9) +!14 = !DILocalVariable(name: "y", line: 8, scope: !15, file: !6, type: !9) !15 = distinct !DILexicalBlock(line: 7, column: 1, file: !19, scope: !5) !16 = !DILocation(line: 8, column: 9, scope: !15) !17 = !DILocation(line: 8, column: 18, scope: !15) diff --git a/llvm/test/DebugInfo/X86/fission-ranges.ll b/llvm/test/DebugInfo/X86/fission-ranges.ll index e5eb25ce90c..8ad4786479f 100644 --- a/llvm/test/DebugInfo/X86/fission-ranges.ll +++ b/llvm/test/DebugInfo/X86/fission-ranges.ll @@ -166,13 +166,13 @@ attributes #1 = { nounwind readnone } !10 = !{null, !11} !11 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !12 = !{!13, !14, !15, !16, !18, !19} -!13 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "p", line: 2, arg: 1, scope: !8, file: !5, type: !11) -!14 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "a", line: 4, scope: !8, file: !5, type: !11) -!15 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "b", line: 4, scope: !8, file: !5, type: !11) -!16 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "d", line: 5, scope: !8, file: !5, type: !17) +!13 = !DILocalVariable(name: "p", line: 2, arg: 1, scope: !8, file: !5, type: !11) +!14 = !DILocalVariable(name: "a", line: 4, scope: !8, file: !5, type: !11) +!15 = !DILocalVariable(name: "b", line: 4, scope: !8, file: !5, type: !11) +!16 = !DILocalVariable(name: "d", line: 5, scope: !8, file: !5, type: !17) !17 = !DIBasicType(tag: DW_TAG_base_type, name: "unsigned int", size: 32, align: 32, encoding: DW_ATE_unsigned) -!18 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "e", line: 5, scope: !8, file: !5, type: !17) -!19 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "w", line: 12, scope: !20, file: !5, type: !25) +!18 = !DILocalVariable(name: "e", line: 5, scope: !8, file: !5, type: !17) +!19 = !DILocalVariable(name: "w", line: 12, scope: !20, file: !5, type: !25) !20 = distinct !DILexicalBlock(line: 11, column: 0, file: !1, scope: !21) !21 = distinct !DILexicalBlock(line: 10, column: 0, file: !1, scope: !22) !22 = distinct !DILexicalBlock(line: 9, column: 0, file: !1, scope: !23) diff --git a/llvm/test/DebugInfo/X86/float_const.ll b/llvm/test/DebugInfo/X86/float_const.ll index 6e99ffcc1f2..982aaa3a3a4 100644 --- a/llvm/test/DebugInfo/X86/float_const.ll +++ b/llvm/test/DebugInfo/X86/float_const.ll @@ -44,7 +44,7 @@ attributes #1 = { nounwind readnone } !10 = !DISubroutineType(types: !11) !11 = !{null} !12 = !{!13} -!13 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "a", line: 2, scope: !7, file: !9, type: !14) +!13 = !DILocalVariable(name: "a", line: 2, scope: !7, file: !9, type: !14) !14 = !DIBasicType(tag: DW_TAG_base_type, name: "float", size: 32, align: 32, encoding: DW_ATE_float) !15 = !{i32 2, !"Dwarf Version", i32 2} !16 = !{i32 2, !"Debug Info Version", i32 3} diff --git a/llvm/test/DebugInfo/X86/formal_parameter.ll b/llvm/test/DebugInfo/X86/formal_parameter.ll index e8a8b5f1803..3b833d1538f 100644 --- a/llvm/test/DebugInfo/X86/formal_parameter.ll +++ b/llvm/test/DebugInfo/X86/formal_parameter.ll @@ -69,7 +69,7 @@ attributes #3 = { nounwind } !7 = !{null, !8} !8 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !9 = !{!10} -!10 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "map", line: 1, arg: 1, scope: !4, file: !5, type: !8) +!10 = !DILocalVariable(name: "map", line: 1, arg: 1, scope: !4, file: !5, type: !8) !11 = !{i32 2, !"Dwarf Version", i32 2} !12 = !{i32 1, !"Debug Info Version", i32 3} !13 = !{!"clang version 3.5.0 "} diff --git a/llvm/test/DebugInfo/X86/frame-register.ll b/llvm/test/DebugInfo/X86/frame-register.ll index bcf65a1a385..d5fed1fa09c 100644 --- a/llvm/test/DebugInfo/X86/frame-register.ll +++ b/llvm/test/DebugInfo/X86/frame-register.ll @@ -48,12 +48,12 @@ attributes #1 = { nounwind readnone } !12 = !{i32 2, !"Dwarf Version", i32 4} !13 = !{i32 2, !"Debug Info Version", i32 3} !14 = !{!"clang version 3.7.0"} -!15 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "i", line: 2, arg: 1, scope: !4, file: !5, type: !8) +!15 = !DILocalVariable(name: "i", line: 2, arg: 1, scope: !4, file: !5, type: !8) !16 = !DIExpression() !17 = !DILocation(line: 2, column: 10, scope: !4) !18 = !DILocation(line: 4, column: 10, scope: !4) !19 = !DILocation(line: 4, column: 3, scope: !4) -!20 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "i", line: 10, scope: !9, file: !5, type: !8) +!20 = !DILocalVariable(name: "i", line: 10, scope: !9, file: !5, type: !8) !21 = !DILocation(line: 10, column: 7, scope: !9) !22 = !DILocation(line: 11, column: 15, scope: !9) !23 = !DILocation(line: 11, column: 10, scope: !9) diff --git a/llvm/test/DebugInfo/X86/generate-odr-hash.ll b/llvm/test/DebugInfo/X86/generate-odr-hash.ll index 7ac9a69181f..293c92a1a6b 100644 --- a/llvm/test/DebugInfo/X86/generate-odr-hash.ll +++ b/llvm/test/DebugInfo/X86/generate-odr-hash.ll @@ -264,12 +264,12 @@ attributes #1 = { nounwind readnone } !43 = !{i32 2, !"Dwarf Version", i32 4} !44 = !{i32 1, !"Debug Info Version", i32 3} !45 = !{!"clang version 3.5 "} -!46 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "b", line: 7, scope: !22, file: !23, type: !47) +!46 = !DILocalVariable(name: "b", line: 7, scope: !22, file: !23, type: !47) !47 = !DICompositeType(tag: DW_TAG_structure_type, name: "baz", line: 6, size: 8, align: 8, file: !1, scope: !22, elements: !2) !48 = !DILocation(line: 7, scope: !22) !49 = !DILocation(line: 8, scope: !22) !50 = !DILocation(line: 29, scope: !26) -!51 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !27, type: !52) +!51 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !27, type: !52) !52 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !28) !53 = !DILocation(line: 0, scope: !27) !54 = !DILocation(line: 25, scope: !27) diff --git a/llvm/test/DebugInfo/X86/ghost-sdnode-dbgvalues.ll b/llvm/test/DebugInfo/X86/ghost-sdnode-dbgvalues.ll index ef249e8fab9..d080603ae76 100644 --- a/llvm/test/DebugInfo/X86/ghost-sdnode-dbgvalues.ll +++ b/llvm/test/DebugInfo/X86/ghost-sdnode-dbgvalues.ll @@ -84,22 +84,22 @@ attributes #1 = { nounwind readnone } !13 = !{i32 2, !"Dwarf Version", i32 2} !14 = !{i32 2, !"Debug Info Version", i32 3} !15 = !{!"clang version 3.6.0 "} -!16 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "a", line: 3, arg: 1, scope: !8, file: !9, type: !12) +!16 = !DILocalVariable(name: "a", line: 3, arg: 1, scope: !8, file: !9, type: !12) !17 = !DIExpression() !18 = !DILocation(line: 3, column: 13, scope: !8) !19 = !DILocation(line: 4, column: 5, scope: !8) -!20 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "b", line: 4, scope: !8, file: !9, type: !12) +!20 = !DILocalVariable(name: "b", line: 4, scope: !8, file: !9, type: !12) !21 = !DILocation(line: 4, column: 9, scope: !8) !22 = !DILocation(line: 5, column: 5, scope: !8) -!23 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "c", line: 5, scope: !8, file: !9, type: !12) +!23 = !DILocalVariable(name: "c", line: 5, scope: !8, file: !9, type: !12) !24 = !DILocation(line: 5, column: 9, scope: !8) !25 = !DILocation(line: 6, column: 5, scope: !8) -!26 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "d", line: 6, scope: !8, file: !9, type: !12) +!26 = !DILocalVariable(name: "d", line: 6, scope: !8, file: !9, type: !12) !27 = !DILocation(line: 6, column: 9, scope: !8) !28 = !DILocation(line: 7, column: 5, scope: !8) -!29 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "e", line: 7, scope: !8, file: !9, type: !12) +!29 = !DILocalVariable(name: "e", line: 7, scope: !8, file: !9, type: !12) !30 = !DILocation(line: 7, column: 9, scope: !8) !31 = !DILocation(line: 8, column: 5, scope: !8) -!32 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "f", line: 8, scope: !8, file: !9, type: !12) +!32 = !DILocalVariable(name: "f", line: 8, scope: !8, file: !9, type: !12) !33 = !DILocation(line: 8, column: 9, scope: !8) !34 = !DILocation(line: 9, column: 5, scope: !8) diff --git a/llvm/test/DebugInfo/X86/gnu-public-names.ll b/llvm/test/DebugInfo/X86/gnu-public-names.ll index 2022dfaa687..ab6703728ef 100644 --- a/llvm/test/DebugInfo/X86/gnu-public-names.ll +++ b/llvm/test/DebugInfo/X86/gnu-public-names.ll @@ -351,7 +351,7 @@ attributes #1 = { nounwind readnone } !48 = !{i32 2, !"Dwarf Version", i32 4} !49 = !{i32 2, !"Debug Info Version", i32 3} !50 = !{!"clang version 3.7.0 (trunk 234897) (llvm/trunk 234911)"} -!51 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, scope: !20, type: !52, flags: DIFlagArtificial | DIFlagObjectPointer) +!51 = !DILocalVariable(name: "this", arg: 1, scope: !20, type: !52, flags: DIFlagArtificial | DIFlagObjectPointer) !52 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !"_ZTS1C", size: 64, align: 64) !53 = !DIExpression() !54 = !DILocation(line: 0, scope: !20) diff --git a/llvm/test/DebugInfo/X86/inline-member-function.ll b/llvm/test/DebugInfo/X86/inline-member-function.ll index 73cd1947f4f..ee2047e6233 100644 --- a/llvm/test/DebugInfo/X86/inline-member-function.ll +++ b/llvm/test/DebugInfo/X86/inline-member-function.ll @@ -88,8 +88,8 @@ attributes #1 = { nounwind readnone } !21 = !{i32 1, !"Debug Info Version", i32 3} !22 = !{!"clang version 3.5.0 "} !23 = !DILocation(line: 8, scope: !13) -!24 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !17, type: !25) +!24 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !17, type: !25) !25 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !"_ZTS3foo") !26 = !DILocation(line: 0, scope: !17, inlinedAt: !23) -!27 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "x", line: 2, arg: 2, scope: !17, file: !14, type: !9) +!27 = !DILocalVariable(name: "x", line: 2, arg: 2, scope: !17, file: !14, type: !9) !28 = !DILocation(line: 2, scope: !17, inlinedAt: !23) diff --git a/llvm/test/DebugInfo/X86/inline-seldag-test.ll b/llvm/test/DebugInfo/X86/inline-seldag-test.ll index c8e75cf3fcb..be06aeabebe 100644 --- a/llvm/test/DebugInfo/X86/inline-seldag-test.ll +++ b/llvm/test/DebugInfo/X86/inline-seldag-test.ll @@ -63,11 +63,11 @@ attributes #1 = { nounwind readnone } !12 = !{i32 2, !"Dwarf Version", i32 4} !13 = !{i32 1, !"Debug Info Version", i32 3} !14 = !{!"clang version 3.5.0 "} -!15 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "x", line: 5, scope: !4, file: !5, type: !16) +!15 = !DILocalVariable(name: "x", line: 5, scope: !4, file: !5, type: !16) !16 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !11) !17 = !DILocation(line: 5, scope: !4) !18 = !DILocation(line: 6, column: 7, scope: !4) -!19 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "y", line: 1, arg: 1, scope: !8, file: !5, type: !11) +!19 = !DILocalVariable(name: "y", line: 1, arg: 1, scope: !8, file: !5, type: !11) !20 = !DILocation(line: 1, scope: !8, inlinedAt: !18) !21 = !DILocation(line: 2, scope: !8, inlinedAt: !18) !22 = !DILocation(line: 7, scope: !4) diff --git a/llvm/test/DebugInfo/X86/inlined-formal-parameter.ll b/llvm/test/DebugInfo/X86/inlined-formal-parameter.ll index 3cc4e5a65a6..6a5274a4bd5 100644 --- a/llvm/test/DebugInfo/X86/inlined-formal-parameter.ll +++ b/llvm/test/DebugInfo/X86/inlined-formal-parameter.ll @@ -60,7 +60,7 @@ attributes #3 = { nounwind } !9 = !{null, !10} !10 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !11 = !{!12} -!12 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "a", arg: 1, scope: !7, file: !1, line: 2, type: !10) +!12 = !DILocalVariable(name: "a", arg: 1, scope: !7, file: !1, line: 2, type: !10) !13 = !{i32 2, !"Dwarf Version", i32 2} !14 = !{i32 2, !"Debug Info Version", i32 3} !15 = !{i32 1, !"PIC Level", i32 2} diff --git a/llvm/test/DebugInfo/X86/instcombine-instrinsics.ll b/llvm/test/DebugInfo/X86/instcombine-instrinsics.ll index 8241e6498f9..eeafca8cda3 100644 --- a/llvm/test/DebugInfo/X86/instcombine-instrinsics.ll +++ b/llvm/test/DebugInfo/X86/instcombine-instrinsics.ll @@ -65,7 +65,7 @@ attributes #1 = { nounwind readnone } !8 = !{i32 2, !"Dwarf Version", i32 2} !9 = !{i32 1, !"Debug Info Version", i32 3} !10 = !{!"clang version 3.5.0 "} -!11 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "p", line: 8, scope: !4, file: !5, type: !12) +!11 = !DILocalVariable(name: "p", line: 8, scope: !4, file: !5, type: !12) !12 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !13) !13 = !DIDerivedType(tag: DW_TAG_typedef, name: "i14", line: 3, file: !1, baseType: !14) !14 = !DICompositeType(tag: DW_TAG_structure_type, line: 1, size: 64, align: 64, file: !1, elements: !15) diff --git a/llvm/test/DebugInfo/X86/lexical_block.ll b/llvm/test/DebugInfo/X86/lexical_block.ll index 2619f12f69e..5af8b751817 100644 --- a/llvm/test/DebugInfo/X86/lexical_block.ll +++ b/llvm/test/DebugInfo/X86/lexical_block.ll @@ -59,7 +59,7 @@ attributes #1 = { nounwind readnone } !8 = !{i32 2, !"Dwarf Version", i32 4} !9 = !{i32 1, !"Debug Info Version", i32 3} !10 = !{!"clang version 3.5.0 "} -!11 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "i", line: 2, scope: !12, file: !5, type: !13) +!11 = !DILocalVariable(name: "i", line: 2, scope: !12, file: !5, type: !13) !12 = distinct !DILexicalBlock(line: 2, column: 0, file: !1, scope: !4) !13 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !14 = !DILocation(line: 2, scope: !12) diff --git a/llvm/test/DebugInfo/X86/line-info.ll b/llvm/test/DebugInfo/X86/line-info.ll index a3d957f8bc4..cd0f40e8c92 100644 --- a/llvm/test/DebugInfo/X86/line-info.ll +++ b/llvm/test/DebugInfo/X86/line-info.ll @@ -52,7 +52,7 @@ attributes #1 = { nounwind readnone } !11 = !DIFile(filename: "list0.c", directory: "/usr/local/google/home/blaikie/dev/scratch") !12 = !DISubroutineType(types: !13) !13 = !{!9} -!14 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "x", line: 1, arg: 1, scope: !4, file: !6, type: !9) +!14 = !DILocalVariable(name: "x", line: 1, arg: 1, scope: !4, file: !6, type: !9) !15 = !DILocation(line: 1, scope: !4) !16 = !DILocation(line: 2, scope: !4) !17 = !DILocation(line: 3, scope: !18) diff --git a/llvm/test/DebugInfo/X86/linkage-name.ll b/llvm/test/DebugInfo/X86/linkage-name.ll index 330a7f9e53a..83914a43feb 100644 --- a/llvm/test/DebugInfo/X86/linkage-name.ll +++ b/llvm/test/DebugInfo/X86/linkage-name.ll @@ -41,10 +41,10 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !13 = !DISubprogram(name: "a", linkageName: "_ZN1A1aEi", line: 2, isLocal: false, isDefinition: false, virtualIndex: 6, flags: DIFlagPrivate | DIFlagPrototyped, isOptimized: false, file: !6, scope: !11, type: !7) !18 = !{!20} !20 = !DIGlobalVariable(name: "a", line: 9, isLocal: false, isDefinition: true, scope: null, file: !6, type: !11, variable: %class.A* @a) -!21 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 5, arg: 1, flags: DIFlagArtificial, scope: !5, file: !6, type: !22) +!21 = !DILocalVariable(name: "this", line: 5, arg: 1, flags: DIFlagArtificial, scope: !5, file: !6, type: !22) !22 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !11) !23 = !DILocation(line: 5, column: 8, scope: !5) -!24 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "b", line: 5, arg: 2, scope: !5, file: !6, type: !9) +!24 = !DILocalVariable(name: "b", line: 5, arg: 2, scope: !5, file: !6, type: !9) !25 = !DILocation(line: 5, column: 14, scope: !5) !26 = !DILocation(line: 6, column: 4, scope: !27) !27 = distinct !DILexicalBlock(line: 5, column: 17, file: !6, scope: !5) diff --git a/llvm/test/DebugInfo/X86/mi-print.ll b/llvm/test/DebugInfo/X86/mi-print.ll index b5d7b0ef067..28df8e83109 100644 --- a/llvm/test/DebugInfo/X86/mi-print.ll +++ b/llvm/test/DebugInfo/X86/mi-print.ll @@ -40,17 +40,17 @@ attributes #1 = { nounwind readnone } !6 = !{!7, !7} !7 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !8 = !{!9} -!9 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "x", arg: 1, scope: !4, file: !1, line: 2, type: !7) +!9 = !DILocalVariable(name: "x", arg: 1, scope: !4, file: !1, line: 2, type: !7) !10 = !DISubprogram(name: "foo", scope: !1, file: !1, line: 1, type: !5, isLocal: true, isDefinition: true, scopeLine: 1, flags: DIFlagPrototyped, isOptimized: true, variables: !11) !11 = !{!12} -!12 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "x", arg: 1, scope: !10, file: !1, line: 1, type: !7) +!12 = !DILocalVariable(name: "x", arg: 1, scope: !10, file: !1, line: 1, type: !7) !13 = !{i32 2, !"Dwarf Version", i32 2} !14 = !{i32 2, !"Debug Info Version", i32 3} !15 = !{i32 1, !"PIC Level", i32 2} !16 = !{!"clang version 3.7.0 (trunk 233919) (llvm/trunk 233920)"} !17 = !DIExpression() !18 = !DILocation(line: 2, column: 13, scope: !4) -!19 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "x", arg: 1, scope: !10, file: !1, line: 1, type: !7) +!19 = !DILocalVariable(name: "x", arg: 1, scope: !10, file: !1, line: 1, type: !7) !20 = distinct !DILocation(line: 2, column: 25, scope: !4) !21 = !DILocation(line: 1, column: 20, scope: !10, inlinedAt: !20) !22 = !DILocation(line: 2, column: 18, scope: !4) diff --git a/llvm/test/DebugInfo/X86/misched-dbg-value.ll b/llvm/test/DebugInfo/X86/misched-dbg-value.ll index c660e1f72a9..28a899061c9 100644 --- a/llvm/test/DebugInfo/X86/misched-dbg-value.ll +++ b/llvm/test/DebugInfo/X86/misched-dbg-value.ll @@ -126,12 +126,12 @@ attributes #1 = { nounwind readnone } !20 = !DISubrange(count: 51) !21 = !DIDerivedType(tag: DW_TAG_typedef, name: "OneToFifty", line: 132, file: !82, baseType: !16) !22 = !{!23, !24, !25, !26, !27, !28} -!23 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "Array1Par", line: 181, arg: 1, scope: !12, file: !3, type: !15) -!24 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "Array2Par", line: 182, arg: 2, scope: !12, file: !3, type: !17) -!25 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "IntParI1", line: 183, arg: 3, scope: !12, file: !3, type: !21) -!26 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "IntParI2", line: 184, arg: 4, scope: !12, file: !3, type: !21) -!27 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "IntLoc", line: 186, scope: !12, file: !3, type: !21) -!28 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "IntIndex", line: 187, scope: !12, file: !3, type: !21) +!23 = !DILocalVariable(name: "Array1Par", line: 181, arg: 1, scope: !12, file: !3, type: !15) +!24 = !DILocalVariable(name: "Array2Par", line: 182, arg: 2, scope: !12, file: !3, type: !17) +!25 = !DILocalVariable(name: "IntParI1", line: 183, arg: 3, scope: !12, file: !3, type: !21) +!26 = !DILocalVariable(name: "IntParI2", line: 184, arg: 4, scope: !12, file: !3, type: !21) +!27 = !DILocalVariable(name: "IntLoc", line: 186, scope: !12, file: !3, type: !21) +!28 = !DILocalVariable(name: "IntIndex", line: 187, scope: !12, file: !3, type: !21) !29 = !{!30, !35, !36, !38, !39, !40, !42, !46, !63} !30 = !DIGlobalVariable(name: "Version", line: 111, isLocal: false, isDefinition: true, scope: null, file: !3, type: !31, variable: [4 x i8]* @Version) !31 = !DICompositeType(tag: DW_TAG_array_type, size: 32, align: 8, baseType: !32, elements: !33) diff --git a/llvm/test/DebugInfo/X86/missing-file-line.ll b/llvm/test/DebugInfo/X86/missing-file-line.ll index 455868cb173..d98a0a89f4b 100644 --- a/llvm/test/DebugInfo/X86/missing-file-line.ll +++ b/llvm/test/DebugInfo/X86/missing-file-line.ll @@ -46,7 +46,7 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) #1 !7 = !{i32 2, !"Dwarf Version", i32 4} !8 = !{i32 2, !"Debug Info Version", i32 3} !9 = !{!"clang"} -!10 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "x", scope: !4, file: !1, line: 8, type: !11) +!10 = !DILocalVariable(name: "x", scope: !4, file: !1, line: 8, type: !11) !11 = !DIDerivedType(tag: DW_TAG_typedef, name: "SS", baseType: !12) !12 = !DICompositeType(tag: DW_TAG_structure_type, name: "S", size: 64, align: 64, elements: !13) !13 = !{!14} diff --git a/llvm/test/DebugInfo/X86/nodebug_with_debug_loc.ll b/llvm/test/DebugInfo/X86/nodebug_with_debug_loc.ll index 8153b3352d4..334c68db940 100644 --- a/llvm/test/DebugInfo/X86/nodebug_with_debug_loc.ll +++ b/llvm/test/DebugInfo/X86/nodebug_with_debug_loc.ll @@ -113,18 +113,18 @@ attributes #3 = { nounwind } !13 = !DISubroutineType(types: !14) !14 = !{null} !15 = !{!16} -!16 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "str2", line: 15, scope: !11, file: !12, type: !"_ZTS6string") +!16 = !DILocalVariable(name: "str2", line: 15, scope: !11, file: !12, type: !"_ZTS6string") !17 = !DISubprogram(name: "s2", linkageName: "_Z2s2P6string", line: 13, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 13, file: !5, scope: !12, type: !18, variables: !21) !18 = !DISubroutineType(types: !19) !19 = !{null, !20} !20 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 32, align: 32, baseType: !"_ZTS6string") !21 = !{!22} -!22 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "lhs", line: 13, arg: 1, scope: !17, file: !12, type: !20) +!22 = !DILocalVariable(name: "lhs", line: 13, arg: 1, scope: !17, file: !12, type: !20) !23 = !{i32 2, !"Dwarf Version", i32 4} !24 = !{i32 2, !"Debug Info Version", i32 3} !25 = !{!"clang version 3.5.0 "} !26 = !DILocation(line: 15, scope: !11) -!27 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "lhs", line: 13, arg: 1, scope: !17, file: !12, type: !20) +!27 = !DILocalVariable(name: "lhs", line: 13, arg: 1, scope: !17, file: !12, type: !20) !28 = !DILocation(line: 16, scope: !11) !29 = !DILocation(line: 13, scope: !17, inlinedAt: !28) !30 = !DILocation(line: 17, scope: !11) diff --git a/llvm/test/DebugInfo/X86/nophysreg.ll b/llvm/test/DebugInfo/X86/nophysreg.ll index f4478efb67f..b1d3733ddec 100644 --- a/llvm/test/DebugInfo/X86/nophysreg.ll +++ b/llvm/test/DebugInfo/X86/nophysreg.ll @@ -152,19 +152,19 @@ attributes #3 = { ssp uwtable } !13 = !DISubroutineType(types: !14) !14 = !{null, !"_ZTS1A"} !15 = !{!16} -!16 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "p5", line: 7, arg: 1, scope: !11, file: !12, type: !"_ZTS1A") +!16 = !DILocalVariable(name: "p5", line: 7, arg: 1, scope: !11, file: !12, type: !"_ZTS1A") !17 = !DISubprogram(name: "f", linkageName: "_Z1fv", line: 12, isLocal: false, isDefinition: true, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 12, file: !1, scope: !12, type: !18, function: void ()* @_Z1fv, variables: !20) !18 = !DISubroutineType(types: !19) !19 = !{null} !20 = !{!21, !23, !26, !27, !28} -!21 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "x", line: 14, scope: !22, file: !12, type: !8) +!21 = !DILocalVariable(name: "x", line: 14, scope: !22, file: !12, type: !8) !22 = distinct !DILexicalBlock(line: 13, column: 18, file: !1, scope: !17) -!23 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "y", line: 17, scope: !24, file: !12, type: !25) +!23 = !DILocalVariable(name: "y", line: 17, scope: !24, file: !12, type: !25) !24 = distinct !DILexicalBlock(line: 16, column: 20, file: !1, scope: !22) !25 = !DIBasicType(tag: DW_TAG_base_type, name: "char", size: 8, align: 8, encoding: DW_ATE_signed_char) -!26 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "j", line: 19, scope: !24, file: !12, type: !25) -!27 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "I", line: 21, scope: !24, file: !12, type: !25) -!28 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "g", line: 24, scope: !24, file: !12, type: !"_ZTS1A") +!26 = !DILocalVariable(name: "j", line: 19, scope: !24, file: !12, type: !25) +!27 = !DILocalVariable(name: "I", line: 21, scope: !24, file: !12, type: !25) +!28 = !DILocalVariable(name: "g", line: 24, scope: !24, file: !12, type: !"_ZTS1A") !29 = !{i32 2, !"Dwarf Version", i32 2} !30 = !{i32 2, !"Debug Info Version", i32 3} !31 = !{i32 1, !"PIC Level", i32 2} @@ -196,7 +196,7 @@ attributes #3 = { ssp uwtable } !57 = !DILocation(line: 23, column: 15, scope: !24) !58 = !DILocation(line: 23, column: 7, scope: !24) !59 = !DILocation(line: 24, column: 9, scope: !24) -!60 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "p5", line: 7, arg: 1, scope: !11, file: !12, type: !"_ZTS1A") +!60 = !DILocalVariable(name: "p5", line: 7, arg: 1, scope: !11, file: !12, type: !"_ZTS1A") !61 = distinct !DILocation(line: 26, column: 7, scope: !24) !62 = !DILocation(line: 7, column: 42, scope: !11, inlinedAt: !61) !63 = !DILocation(line: 7, column: 48, scope: !11, inlinedAt: !61) diff --git a/llvm/test/DebugInfo/X86/objc-property-void.ll b/llvm/test/DebugInfo/X86/objc-property-void.ll index 0737fe2d2cb..45d35126dae 100644 --- a/llvm/test/DebugInfo/X86/objc-property-void.ll +++ b/llvm/test/DebugInfo/X86/objc-property-void.ll @@ -96,9 +96,9 @@ attributes #1 = { nounwind readnone } !21 = !{i32 2, !"Dwarf Version", i32 2} !22 = !{i32 1, !"Debug Info Version", i32 3} !23 = !{!""} -!24 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "self", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !10, type: !25) +!24 = !DILocalVariable(name: "self", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !10, type: !25) !25 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !4) !26 = !DILocation(line: 0, scope: !10) -!27 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "_cmd", arg: 2, flags: DIFlagArtificial, scope: !10, type: !28) +!27 = !DILocalVariable(name: "_cmd", arg: 2, flags: DIFlagArtificial, scope: !10, type: !28) !28 = !DIDerivedType(tag: DW_TAG_typedef, name: "SEL", line: 5, file: !5, baseType: !15) !29 = !DILocation(line: 5, scope: !10) diff --git a/llvm/test/DebugInfo/X86/op_deref.ll b/llvm/test/DebugInfo/X86/op_deref.ll index 86f629e9c15..09200a6b2ea 100644 --- a/llvm/test/DebugInfo/X86/op_deref.ll +++ b/llvm/test/DebugInfo/X86/op_deref.ll @@ -88,16 +88,16 @@ declare void @llvm.stackrestore(i8*) nounwind !7 = !DISubroutineType(types: !8) !8 = !{null, !9} !9 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -!10 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "s", line: 1, arg: 1, scope: !5, file: !6, type: !9) +!10 = !DILocalVariable(name: "s", line: 1, arg: 1, scope: !5, file: !6, type: !9) !11 = !DILocation(line: 1, column: 26, scope: !5) !12 = !DILocation(line: 3, column: 13, scope: !13) !13 = distinct !DILexicalBlock(line: 2, column: 1, file: !28, scope: !5) -!14 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "vla", line: 3, scope: !13, file: !6, type: !15) +!14 = !DILocalVariable(name: "vla", line: 3, scope: !13, file: !6, type: !15) !15 = !DICompositeType(tag: DW_TAG_array_type, align: 32, baseType: !9, elements: !16) !16 = !{!17} !17 = !DISubrange(count: -1) !18 = !DILocation(line: 3, column: 7, scope: !13) -!19 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "i", line: 4, scope: !13, file: !6, type: !9) +!19 = !DILocalVariable(name: "i", line: 4, scope: !13, file: !6, type: !9) !20 = !DILocation(line: 4, column: 7, scope: !13) !21 = !DILocation(line: 5, column: 8, scope: !22) !22 = distinct !DILexicalBlock(line: 5, column: 3, file: !28, scope: !13) diff --git a/llvm/test/DebugInfo/X86/parameters.ll b/llvm/test/DebugInfo/X86/parameters.ll index 044f51e6e6b..b351786c372 100644 --- a/llvm/test/DebugInfo/X86/parameters.ll +++ b/llvm/test/DebugInfo/X86/parameters.ll @@ -103,13 +103,13 @@ attributes #2 = { "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "n !19 = !{null, !20, !8} !20 = !DIBasicType(tag: DW_TAG_base_type, name: "bool", size: 8, align: 8, encoding: DW_ATE_boolean) !21 = !{i32 2, !"Dwarf Version", i32 3} -!22 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "f", line: 6, arg: 1, scope: !4, file: !23, type: !8) +!22 = !DILocalVariable(name: "f", line: 6, arg: 1, scope: !4, file: !23, type: !8) !23 = !DIFile(filename: "pass.cpp", directory: "/tmp") !24 = !DILocation(line: 6, scope: !4) !25 = !DILocation(line: 7, scope: !4) -!26 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "b", line: 12, arg: 1, scope: !17, file: !23, type: !20) +!26 = !DILocalVariable(name: "b", line: 12, arg: 1, scope: !17, file: !23, type: !20) !27 = !DILocation(line: 12, scope: !17) -!28 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "g", line: 12, arg: 2, scope: !17, file: !23, type: !8) +!28 = !DILocalVariable(name: "g", line: 12, arg: 2, scope: !17, file: !23, type: !8) !29 = !DILocation(line: 13, scope: !30) !30 = distinct !DILexicalBlock(line: 13, column: 0, file: !1, scope: !17) !31 = !DILocation(line: 14, scope: !30) diff --git a/llvm/test/DebugInfo/X86/pieces-1.ll b/llvm/test/DebugInfo/X86/pieces-1.ll index f96e045f828..984d8796b99 100644 --- a/llvm/test/DebugInfo/X86/pieces-1.ll +++ b/llvm/test/DebugInfo/X86/pieces-1.ll @@ -66,13 +66,13 @@ attributes #1 = { nounwind readnone } !13 = !DIBasicType(tag: DW_TAG_base_type, name: "long int", size: 64, align: 64, encoding: DW_ATE_signed) !14 = !DIDerivedType(tag: DW_TAG_member, name: "b", line: 1, size: 32, align: 32, offset: 64, file: !1, scope: !10, baseType: !8) !15 = !{!16} -!16 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "s", line: 3, arg: 1, scope: !4, file: !5, type: !9) +!16 = !DILocalVariable(name: "s", line: 3, arg: 1, scope: !4, file: !5, type: !9) !17 = !{i32 2, !"Dwarf Version", i32 4} !18 = !{i32 1, !"Debug Info Version", i32 3} !19 = !{!"clang version 3.5 "} -!20 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "s", line: 3, arg: 1, scope: !4, file: !5, type: !9) +!20 = !DILocalVariable(name: "s", line: 3, arg: 1, scope: !4, file: !5, type: !9) !21 = !DILocation(line: 3, scope: !4) -!22 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "s", line: 3, arg: 1, scope: !4, file: !5, type: !9) +!22 = !DILocalVariable(name: "s", line: 3, arg: 1, scope: !4, file: !5, type: !9) !23 = !DILocation(line: 4, scope: !4) !24 = !DIExpression(DW_OP_bit_piece, 0, 64) !25 = !{} diff --git a/llvm/test/DebugInfo/X86/pieces-2.ll b/llvm/test/DebugInfo/X86/pieces-2.ll index 7c39d323c3e..25ae12785a0 100644 --- a/llvm/test/DebugInfo/X86/pieces-2.ll +++ b/llvm/test/DebugInfo/X86/pieces-2.ll @@ -82,10 +82,10 @@ attributes #2 = { nounwind } !22 = !{i32 2, !"Dwarf Version", i32 2} !23 = !{i32 1, !"Debug Info Version", i32 3} !24 = !{!"clang version 3.5.0 "} -!25 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "outer", line: 10, arg: 1, scope: !4, file: !5, type: !9) +!25 = !DILocalVariable(name: "outer", line: 10, arg: 1, scope: !4, file: !5, type: !9) !26 = !DILocation(line: 10, scope: !4) !27 = !DILocation(line: 11, scope: !4) -!28 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "i1", line: 11, scope: !4, file: !5, type: !14) +!28 = !DILocalVariable(name: "i1", line: 11, scope: !4, file: !5, type: !14) !29 = !DIExpression(DW_OP_bit_piece, 0, 32) !31 = !{i32 3, i32 0, i32 12} !32 = !DILocation(line: 12, scope: !4) diff --git a/llvm/test/DebugInfo/X86/pieces-3.ll b/llvm/test/DebugInfo/X86/pieces-3.ll index 97ff9aadfcf..3080943f7de 100644 --- a/llvm/test/DebugInfo/X86/pieces-3.ll +++ b/llvm/test/DebugInfo/X86/pieces-3.ll @@ -91,16 +91,16 @@ attributes #2 = { nounwind } !21 = !{i32 2, !"Dwarf Version", i32 2} !22 = !{i32 1, !"Debug Info Version", i32 3} !23 = !{!"clang version 3.5.0 "} -!24 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "outer", line: 10, arg: 1, scope: !4, file: !5, type: !9) +!24 = !DILocalVariable(name: "outer", line: 10, arg: 1, scope: !4, file: !5, type: !9) !25 = !DIExpression(DW_OP_bit_piece, 0, 64) !26 = !DILocation(line: 10, scope: !4) -!27 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "outer", line: 10, arg: 1, scope: !4, file: !5, type: !9) +!27 = !DILocalVariable(name: "outer", line: 10, arg: 1, scope: !4, file: !5, type: !9) !28 = !DIExpression(DW_OP_bit_piece, 64, 64) -!29 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "outer", line: 10, arg: 1, scope: !4, file: !5, type: !9) +!29 = !DILocalVariable(name: "outer", line: 10, arg: 1, scope: !4, file: !5, type: !9) !30 = !DIExpression(DW_OP_bit_piece, 96, 32) -!31 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "outer", line: 10, arg: 1, scope: !4, file: !5, type: !9) +!31 = !DILocalVariable(name: "outer", line: 10, arg: 1, scope: !4, file: !5, type: !9) !32 = !DIExpression(DW_OP_bit_piece, 64, 32) !33 = !DILocation(line: 11, scope: !4) -!34 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "i1", line: 11, scope: !4, file: !5, type: !14) +!34 = !DILocalVariable(name: "i1", line: 11, scope: !4, file: !5, type: !14) !35 = !DIExpression(DW_OP_bit_piece, 0, 32) !36 = !DILocation(line: 12, scope: !4) diff --git a/llvm/test/DebugInfo/X86/pr11300.ll b/llvm/test/DebugInfo/X86/pr11300.ll index b68609dd718..46e80e23295 100644 --- a/llvm/test/DebugInfo/X86/pr11300.ll +++ b/llvm/test/DebugInfo/X86/pr11300.ll @@ -53,12 +53,12 @@ entry: !14 = !{null, !15} !15 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, flags: DIFlagArtificial, baseType: !10) !20 = !DISubprogram(name: "bar", linkageName: "_ZN3foo3barEv", line: 2, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 2, file: !6, scope: null, type: !13, function: void (%struct.foo*)* @_ZN3foo3barEv, declaration: !12) -!23 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "x", line: 4, arg: 1, scope: !5, file: !6, type: !9) +!23 = !DILocalVariable(name: "x", line: 4, arg: 1, scope: !5, file: !6, type: !9) !24 = !DILocation(line: 4, column: 15, scope: !5) !25 = !DILocation(line: 4, column: 20, scope: !26) !26 = distinct !DILexicalBlock(line: 4, column: 18, file: !6, scope: !5) !27 = !DILocation(line: 4, column: 30, scope: !26) -!28 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 2, arg: 1, flags: DIFlagArtificial, scope: !20, file: !6, type: !15) +!28 = !DILocalVariable(name: "this", line: 2, arg: 1, flags: DIFlagArtificial, scope: !20, file: !6, type: !15) !29 = !DILocation(line: 2, column: 8, scope: !20) !30 = !DILocation(line: 2, column: 15, scope: !31) !31 = distinct !DILexicalBlock(line: 2, column: 14, file: !6, scope: !20) diff --git a/llvm/test/DebugInfo/X86/pr12831.ll b/llvm/test/DebugInfo/X86/pr12831.ll index 98b9ce48860..0f0fd690652 100644 --- a/llvm/test/DebugInfo/X86/pr12831.ll +++ b/llvm/test/DebugInfo/X86/pr12831.ll @@ -178,26 +178,26 @@ entry: !130 = !DIGlobalVariable(name: "__stored_locally", linkageName: "__stored_locally", line: 2, isLocal: true, isDefinition: true, scope: !114, file: !6, type: !131, variable: i1 1) !131 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !132) !132 = !DIBasicType(tag: DW_TAG_base_type, name: "bool", size: 8, align: 8, encoding: DW_ATE_boolean) -!133 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 19, arg: 1, flags: DIFlagArtificial, scope: !5, file: !6, type: !134) +!133 = !DILocalVariable(name: "this", line: 19, arg: 1, flags: DIFlagArtificial, scope: !5, file: !6, type: !134) !134 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !10) !135 = !DILocation(line: 19, column: 39, scope: !5) !136 = !DILocation(line: 20, column: 17, scope: !137) !137 = distinct !DILexicalBlock(line: 19, column: 51, file: !6, scope: !5) !138 = !DILocation(line: 23, column: 17, scope: !137) !139 = !DILocation(line: 26, column: 15, scope: !137) -!140 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 8, arg: 1, flags: DIFlagArtificial, scope: !106, file: !6, type: !141) +!140 = !DILocalVariable(name: "this", line: 8, arg: 1, flags: DIFlagArtificial, scope: !106, file: !6, type: !141) !141 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !20) !142 = !DILocation(line: 8, column: 45, scope: !106) -!143 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "__f", line: 8, arg: 2, scope: !106, file: !6, type: !61) +!143 = !DILocalVariable(name: "__f", line: 8, arg: 2, scope: !106, file: !6, type: !61) !144 = !DILocation(line: 8, column: 63, scope: !106) !145 = !DILocation(line: 9, column: 9, scope: !146) !146 = distinct !DILexicalBlock(line: 8, column: 81, file: !6, scope: !106) !147 = !DILocation(line: 10, column: 13, scope: !146) !148 = !DILocation(line: 4, column: 5, scope: !149) !149 = distinct !DILexicalBlock(line: 3, column: 105, file: !6, scope: !107) -!150 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 8, arg: 1, flags: DIFlagArtificial, scope: !126, file: !6, type: !141) +!150 = !DILocalVariable(name: "this", line: 8, arg: 1, flags: DIFlagArtificial, scope: !126, file: !6, type: !141) !151 = !DILocation(line: 8, column: 45, scope: !126) -!152 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "__f", line: 8, arg: 2, scope: !126, file: !6, type: !26) +!152 = !DILocalVariable(name: "__f", line: 8, arg: 2, scope: !126, file: !6, type: !26) !153 = !DILocation(line: 8, column: 63, scope: !126) !154 = !DILocation(line: 9, column: 9, scope: !155) !155 = distinct !DILexicalBlock(line: 8, column: 81, file: !6, scope: !126) diff --git a/llvm/test/DebugInfo/X86/pr19307.ll b/llvm/test/DebugInfo/X86/pr19307.ll index e04131fe322..431fd91f595 100644 --- a/llvm/test/DebugInfo/X86/pr19307.ll +++ b/llvm/test/DebugInfo/X86/pr19307.ll @@ -129,10 +129,10 @@ attributes #2 = { "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "n !42 = !{i32 2, !"Dwarf Version", i32 4} !43 = !{i32 2, !"Debug Info Version", i32 3} !44 = !{!"clang version 3.5.0 (209308)"} -!45 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "offset", line: 3, arg: 1, scope: !13, file: !14, type: !17) +!45 = !DILocalVariable(name: "offset", line: 3, arg: 1, scope: !13, file: !14, type: !17) !46 = !DILocation(line: 3, scope: !13) -!47 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "limit", line: 3, arg: 2, scope: !13, file: !14, type: !17) -!48 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "range", line: 4, arg: 3, scope: !13, file: !14, type: !19) +!47 = !DILocalVariable(name: "limit", line: 3, arg: 2, scope: !13, file: !14, type: !17) +!48 = !DILocalVariable(name: "range", line: 4, arg: 3, scope: !13, file: !14, type: !19) !49 = !DILocation(line: 4, scope: !13) !50 = !DILocation(line: 5, scope: !51) !51 = distinct !DILexicalBlock(line: 5, column: 0, file: !1, scope: !13) diff --git a/llvm/test/DebugInfo/X86/recursive_inlining.ll b/llvm/test/DebugInfo/X86/recursive_inlining.ll index 7825646c7c8..c059b98c0c8 100644 --- a/llvm/test/DebugInfo/X86/recursive_inlining.ll +++ b/llvm/test/DebugInfo/X86/recursive_inlining.ll @@ -223,7 +223,7 @@ attributes #3 = { nounwind } !21 = !DISubprogram(name: "fn7", linkageName: "_Z3fn7v", line: 14, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 14, file: !5, scope: !15, type: !16, variables: !2) !22 = !DISubprogram(name: "m_fn2", linkageName: "_ZN1C5m_fn2Ev", line: 7, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 7, file: !5, scope: !"_ZTS1C", type: !10, function: void (%struct.C*)* @_ZN1C5m_fn2Ev, declaration: !9, variables: !23) !23 = !{!24} -!24 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !22, type: !25) +!24 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !22, type: !25) !25 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !"_ZTS1C") !26 = !{!27} !27 = !DIGlobalVariable(name: "x", line: 13, isLocal: false, isDefinition: true, scope: null, file: !15, type: !25, variable: %struct.C** @x) @@ -236,7 +236,7 @@ attributes #3 = { nounwind } !34 = !{!"any pointer", !35, i64 0} !35 = !{!"omnipotent char", !36, i64 0} !36 = !{!"Simple C/C++ TBAA"} -!37 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !22, type: !25) +!37 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !22, type: !25) !38 = !DILocation(line: 0, scope: !22, inlinedAt: !32) !39 = !DILocation(line: 8, scope: !22, inlinedAt: !32) !40 = !DILocation(line: 9, scope: !41, inlinedAt: !32) @@ -256,7 +256,7 @@ attributes #3 = { nounwind } !54 = !DILocation(line: 20, scope: !18, inlinedAt: !55) !55 = !DILocation(line: 10, scope: !22) !56 = !DILocation(line: 17, scope: !14, inlinedAt: !54) -!57 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !22, type: !25) +!57 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !22, type: !25) !58 = !DILocation(line: 0, scope: !22, inlinedAt: !56) !59 = !DILocation(line: 8, scope: !22, inlinedAt: !56) !60 = !DILocation(line: 9, scope: !41, inlinedAt: !56) @@ -266,7 +266,7 @@ attributes #3 = { nounwind } !64 = !DILocation(line: 16, scope: !14, inlinedAt: !65) !65 = !DILocation(line: 20, scope: !18) !66 = !DILocation(line: 17, scope: !14, inlinedAt: !65) -!67 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !22, type: !25) +!67 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !22, type: !25) !68 = !DILocation(line: 0, scope: !22, inlinedAt: !66) !69 = !DILocation(line: 8, scope: !22, inlinedAt: !66) !70 = !DILocation(line: 9, scope: !41, inlinedAt: !66) diff --git a/llvm/test/DebugInfo/X86/reference-argument.ll b/llvm/test/DebugInfo/X86/reference-argument.ll index 401553ec971..cdbd3f8c5bc 100644 --- a/llvm/test/DebugInfo/X86/reference-argument.ll +++ b/llvm/test/DebugInfo/X86/reference-argument.ll @@ -75,24 +75,24 @@ declare void @_ZN4SValD2Ev(%class.SVal* %this) !44 = !DISubroutineType(types: !45) !45 = !{null, !38} !47 = !{i32 2, !"Dwarf Version", i32 3} -!48 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "v", line: 19, arg: 1, scope: !4, file: !5, type: !8) +!48 = !DILocalVariable(name: "v", line: 19, arg: 1, scope: !4, file: !5, type: !8) !49 = !DILocation(line: 19, scope: !4) -!50 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "v", line: 26, scope: !29, file: !5, type: !9) +!50 = !DILocalVariable(name: "v", line: 26, scope: !29, file: !5, type: !9) !51 = !DILocation(line: 26, scope: !29) !52 = !DILocation(line: 27, scope: !29) !53 = !DILocation(line: 28, scope: !29) -!54 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "a", line: 29, scope: !29, file: !5, type: !39) +!54 = !DILocalVariable(name: "a", line: 29, scope: !29, file: !5, type: !39) !55 = !DILocation(line: 29, scope: !29) !56 = !DILocation(line: 30, scope: !29) !57 = !DILocation(line: 31, scope: !29) !58 = !DILocation(line: 32, scope: !29) -!59 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 22, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !35, file: !5, type: !60) +!59 = !DILocalVariable(name: "this", line: 22, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !35, file: !5, type: !60) !60 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !39) !61 = !DILocation(line: 22, scope: !35) -!62 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "v", line: 22, arg: 2, scope: !35, file: !5, type: !9) -!63 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 14, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !33, file: !5, type: !64) +!62 = !DILocalVariable(name: "v", line: 22, arg: 2, scope: !35, file: !5, type: !9) +!63 = !DILocalVariable(name: "this", line: 14, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !33, file: !5, type: !64) !64 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !9) !65 = !DILocation(line: 14, scope: !33) -!66 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 14, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !34, file: !5, type: !64) +!66 = !DILocalVariable(name: "this", line: 14, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !34, file: !5, type: !64) !67 = !DILocation(line: 14, scope: !34) !68 = !{i32 1, !"Debug Info Version", i32 3} diff --git a/llvm/test/DebugInfo/X86/rvalue-ref.ll b/llvm/test/DebugInfo/X86/rvalue-ref.ll index 4e4da67beb0..bc35a373bb8 100644 --- a/llvm/test/DebugInfo/X86/rvalue-ref.ll +++ b/llvm/test/DebugInfo/X86/rvalue-ref.ll @@ -32,7 +32,7 @@ declare i32 @printf(i8*, ...) !8 = !{null, !9} !9 = !DIDerivedType(tag: DW_TAG_rvalue_reference_type, baseType: !10) !10 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -!11 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "i", line: 4, arg: 1, scope: !5, file: !6, type: !9) +!11 = !DILocalVariable(name: "i", line: 4, arg: 1, scope: !5, file: !6, type: !9) !12 = !DILocation(line: 4, column: 17, scope: !5) !13 = !DILocation(line: 6, column: 3, scope: !14) !14 = distinct !DILexicalBlock(line: 5, column: 1, file: !16, scope: !5) diff --git a/llvm/test/DebugInfo/X86/sret.ll b/llvm/test/DebugInfo/X86/sret.ll index ef8f2e6d65e..0ecfc659125 100644 --- a/llvm/test/DebugInfo/X86/sret.ll +++ b/llvm/test/DebugInfo/X86/sret.ll @@ -323,33 +323,33 @@ attributes #7 = { builtin nounwind } !64 = !{i32 2, !"Dwarf Version", i32 4} !65 = !{i32 1, !"Debug Info Version", i32 3} !66 = !{!"clang version 3.5.0 (trunk 203283) (llvm/trunk 203307)"} -!67 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !49, type: !68) +!67 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !49, type: !68) !68 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !"_ZTS1A") !69 = !DILocation(line: 0, scope: !49) -!70 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "i", line: 16, arg: 2, scope: !49, file: !7, type: !12) +!70 = !DILocalVariable(name: "i", line: 16, arg: 2, scope: !49, file: !7, type: !12) !71 = !DILocation(line: 16, scope: !49) !72 = !DILocation(line: 18, scope: !49) !73 = !DILocation(line: 19, scope: !49) -!74 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !50, type: !68) +!74 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !50, type: !68) !75 = !DILocation(line: 0, scope: !50) -!76 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "rhs", line: 21, arg: 2, scope: !50, file: !7, type: !22) +!76 = !DILocalVariable(name: "rhs", line: 21, arg: 2, scope: !50, file: !7, type: !22) !77 = !DILocation(line: 21, scope: !50) !78 = !DILocation(line: 23, scope: !50) !79 = !DILocation(line: 24, scope: !50) -!80 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !51, type: !68) +!80 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !51, type: !68) !81 = !DILocation(line: 0, scope: !51) -!82 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "rhs", line: 27, arg: 2, scope: !51, file: !7, type: !22) +!82 = !DILocalVariable(name: "rhs", line: 27, arg: 2, scope: !51, file: !7, type: !22) !83 = !DILocation(line: 27, scope: !51) !84 = !DILocation(line: 29, scope: !51) !85 = !DILocation(line: 30, scope: !51) -!86 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !52, type: !68) +!86 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !52, type: !68) !87 = !DILocation(line: 0, scope: !52) !88 = !DILocation(line: 35, scope: !52) -!89 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !53, type: !90) +!89 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !53, type: !90) !90 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !"_ZTS1B") !91 = !DILocation(line: 0, scope: !53) !92 = !DILocation(line: 49, scope: !53) -!93 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "a", line: 49, scope: !53, file: !7, type: !4) +!93 = !DILocalVariable(name: "a", line: 49, scope: !53, file: !7, type: !4) !94 = !DILocation(line: 50, scope: !53) !95 = !DILocation(line: 51, scope: !53) !96 = !DILocation(line: 51, scope: !97) @@ -357,19 +357,19 @@ attributes #7 = { builtin nounwind } !98 = !DILocation(line: 51, scope: !99) !99 = distinct !DILexicalBlock(line: 51, column: 0, file: !1, scope: !100) !100 = distinct !DILexicalBlock(line: 51, column: 0, file: !1, scope: !53) -!101 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !63, type: !68) +!101 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !63, type: !68) !102 = !DILocation(line: 0, scope: !63) !103 = !DILocation(line: 8, scope: !63) -!104 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "argc", line: 53, arg: 1, scope: !54, file: !7, type: !12) +!104 = !DILocalVariable(name: "argc", line: 53, arg: 1, scope: !54, file: !7, type: !12) !105 = !DILocation(line: 53, scope: !54) -!106 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "argv", line: 53, arg: 2, scope: !54, file: !7, type: !57) -!107 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "b", line: 55, scope: !54, file: !7, type: !37) +!106 = !DILocalVariable(name: "argv", line: 53, arg: 2, scope: !54, file: !7, type: !57) +!107 = !DILocalVariable(name: "b", line: 55, scope: !54, file: !7, type: !37) !108 = !DILocation(line: 55, scope: !54) -!109 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "return_val", line: 56, scope: !54, file: !7, type: !12) +!109 = !DILocalVariable(name: "return_val", line: 56, scope: !54, file: !7, type: !12) !110 = !DILocation(line: 56, scope: !54) !111 = !DILocation(line: 56, scope: !112) !112 = distinct !DILexicalBlock(line: 56, column: 0, file: !1, scope: !54) -!113 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "a", line: 58, scope: !54, file: !7, type: !4) +!113 = !DILocalVariable(name: "a", line: 58, scope: !54, file: !7, type: !4) !114 = !DILocation(line: 58, scope: !54) !115 = !DILocation(line: 59, scope: !54) !116 = !DILocation(line: 60, scope: !54) @@ -379,10 +379,10 @@ attributes #7 = { builtin nounwind } !120 = distinct !DILexicalBlock(line: 60, column: 0, file: !1, scope: !54) !121 = !DILocation(line: 60, scope: !122) !122 = distinct !DILexicalBlock(line: 60, column: 0, file: !1, scope: !54) -!123 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !62, type: !90) +!123 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !62, type: !90) !124 = !DILocation(line: 0, scope: !62) !125 = !DILocation(line: 41, scope: !62) -!126 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !61, type: !68) +!126 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !61, type: !68) !127 = !DILocation(line: 0, scope: !61) !128 = !DILocation(line: 8, scope: !61) !129 = !DILocation(line: 8, scope: !130) diff --git a/llvm/test/DebugInfo/X86/sroasplit-1.ll b/llvm/test/DebugInfo/X86/sroasplit-1.ll index 2179aa38095..e0796052fb4 100644 --- a/llvm/test/DebugInfo/X86/sroasplit-1.ll +++ b/llvm/test/DebugInfo/X86/sroasplit-1.ll @@ -25,7 +25,7 @@ ; CHECK: call void @llvm.dbg.value(metadata i32 %[[A:.*]], i64 0, metadata ![[VAR]], metadata ![[PIECE2:[0-9]+]]) ; CHECK: ret i32 %[[A]] ; Read Var and Piece: -; CHECK: ![[VAR]] = !DILocalVariable(tag: DW_TAG_auto_variable, name: "i1",{{.*}} line: 11, +; CHECK: ![[VAR]] = !DILocalVariable(name: "i1",{{.*}} line: 11, ; CHECK: ![[PIECE1]] = !DIExpression(DW_OP_bit_piece, 32, 96) ; CHECK: ![[PIECE2]] = !DIExpression(DW_OP_bit_piece, 0, 32) @@ -90,8 +90,8 @@ attributes #2 = { nounwind } !22 = !{i32 2, !"Dwarf Version", i32 2} !23 = !{i32 1, !"Debug Info Version", i32 3} !24 = !{!"clang version 3.5.0 "} -!25 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "outer", line: 10, arg: 1, scope: !4, file: !5, type: !9) +!25 = !DILocalVariable(name: "outer", line: 10, arg: 1, scope: !4, file: !5, type: !9) !26 = !DILocation(line: 10, scope: !4) -!27 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "i1", line: 11, scope: !4, file: !5, type: !14) +!27 = !DILocalVariable(name: "i1", line: 11, scope: !4, file: !5, type: !14) !28 = !DILocation(line: 11, scope: !4) !29 = !DILocation(line: 12, scope: !4) diff --git a/llvm/test/DebugInfo/X86/sroasplit-2.ll b/llvm/test/DebugInfo/X86/sroasplit-2.ll index b209fafd4df..d40d38097bc 100644 --- a/llvm/test/DebugInfo/X86/sroasplit-2.ll +++ b/llvm/test/DebugInfo/X86/sroasplit-2.ll @@ -23,10 +23,10 @@ ; CHECK: call void @llvm.dbg.value(metadata i64 %outer.coerce0, i64 0, metadata ![[O:[0-9]+]], metadata ![[PIECE1:[0-9]+]]), ; CHECK: call void @llvm.dbg.value(metadata i64 %outer.coerce1, i64 0, metadata ![[O]], metadata ![[PIECE2:[0-9]+]]), ; CHECK: call void @llvm.dbg.value({{.*}}, i64 0, metadata ![[I1:[0-9]+]], metadata ![[PIECE3:[0-9]+]]), -; CHECK-DAG: ![[O]] = !DILocalVariable(tag: DW_TAG_arg_variable, name: "outer",{{.*}} line: 10 +; CHECK-DAG: ![[O]] = !DILocalVariable(name: "outer",{{.*}} line: 10 ; CHECK-DAG: ![[PIECE1]] = !DIExpression(DW_OP_bit_piece, 0, 64) ; CHECK-DAG: ![[PIECE2]] = !DIExpression(DW_OP_bit_piece, 64, 64) -; CHECK-DAG: ![[I1]] = !DILocalVariable(tag: DW_TAG_auto_variable, name: "i1",{{.*}} line: 11 +; CHECK-DAG: ![[I1]] = !DILocalVariable(name: "i1",{{.*}} line: 11 ; CHECK-DAG: ![[PIECE3]] = !DIExpression(DW_OP_bit_piece, 0, 32) ; ModuleID = 'sroasplit-2.c' @@ -95,8 +95,8 @@ attributes #2 = { nounwind } !21 = !{i32 2, !"Dwarf Version", i32 2} !22 = !{i32 1, !"Debug Info Version", i32 3} !23 = !{!"clang version 3.5.0 "} -!24 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "outer", line: 10, arg: 1, scope: !4, file: !5, type: !9) +!24 = !DILocalVariable(name: "outer", line: 10, arg: 1, scope: !4, file: !5, type: !9) !25 = !DILocation(line: 10, scope: !4) -!26 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "i1", line: 11, scope: !4, file: !5, type: !14) +!26 = !DILocalVariable(name: "i1", line: 11, scope: !4, file: !5, type: !14) !27 = !DILocation(line: 11, scope: !4) !28 = !DILocation(line: 12, scope: !4) diff --git a/llvm/test/DebugInfo/X86/sroasplit-3.ll b/llvm/test/DebugInfo/X86/sroasplit-3.ll index 50b701f781d..db65dc6b4b8 100644 --- a/llvm/test/DebugInfo/X86/sroasplit-3.ll +++ b/llvm/test/DebugInfo/X86/sroasplit-3.ll @@ -4,7 +4,7 @@ ; not partitioned into multiple allocas. ; ; CHECK: call void @llvm.dbg.value(metadata float %s.coerce, i64 0, metadata ![[VAR:[0-9]+]], metadata ![[EXPR:[0-9]+]]) -; CHECK: ![[VAR]] = !DILocalVariable(tag: DW_TAG_arg_variable, name: "s",{{.*}} line: 3, +; CHECK: ![[VAR]] = !DILocalVariable(name: "s",{{.*}} line: 3, ; CHECK: ![[EXPR]] = !DIExpression( ; CHECK-NOT: DW_OP_bit_piece @@ -57,7 +57,7 @@ attributes #1 = { nounwind readnone } !13 = !{i32 2, !"Debug Info Version", i32 3} !14 = !{i32 1, !"PIC Level", i32 2} !15 = !{!"clang version 3.6.0 "} -!16 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "s", line: 3, arg: 1, scope: !4, file: !5, type: !9) +!16 = !DILocalVariable(name: "s", line: 3, arg: 1, scope: !4, file: !5, type: !9) !17 = !DIExpression() !18 = !DILocation(line: 3, column: 20, scope: !4) !19 = !DILocation(line: 4, column: 2, scope: !4) diff --git a/llvm/test/DebugInfo/X86/sroasplit-4.ll b/llvm/test/DebugInfo/X86/sroasplit-4.ll index e9fcdf8eac9..cecd5b9ecde 100644 --- a/llvm/test/DebugInfo/X86/sroasplit-4.ll +++ b/llvm/test/DebugInfo/X86/sroasplit-4.ll @@ -137,10 +137,10 @@ attributes #3 = { nounwind } !25 = distinct !DILexicalBlock(line: 19, column: 0, file: !5, scope: !17) !26 = !DILocation(line: 19, scope: !17) !27 = !DILocation(line: 20, scope: !25) -!28 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "y", line: 21, scope: !17, file: !18, type: !"_ZTS1p") +!28 = !DILocalVariable(name: "y", line: 21, scope: !17, file: !18, type: !"_ZTS1p") !29 = !DIExpression() !30 = !DILocation(line: 21, scope: !17) -!31 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "r", line: 22, scope: !17, file: !18, type: !"_ZTS1r") +!31 = !DILocalVariable(name: "r", line: 22, scope: !17, file: !18, type: !"_ZTS1r") !32 = !DILocation(line: 22, scope: !17) !33 = !DILocation(line: 23, scope: !17) !34 = !DILocation(line: 24, scope: !17) diff --git a/llvm/test/DebugInfo/X86/sroasplit-5.ll b/llvm/test/DebugInfo/X86/sroasplit-5.ll index ce6b4544c56..4c3633fdc03 100644 --- a/llvm/test/DebugInfo/X86/sroasplit-5.ll +++ b/llvm/test/DebugInfo/X86/sroasplit-5.ll @@ -82,10 +82,10 @@ attributes #2 = { nounwind } !13 = !{i32 2, !"Dwarf Version", i32 4} !14 = !{i32 2, !"Debug Info Version", i32 3} !15 = !{!"clang version 3.7.0 "} -!16 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "a", line: 8, scope: !4, file: !6, type: !9) +!16 = !DILocalVariable(name: "a", line: 8, scope: !4, file: !6, type: !9) !17 = !DIExpression() !18 = !DILocation(line: 8, scope: !4) !19 = !DILocation(line: 9, scope: !4) -!20 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "local", line: 10, scope: !4, file: !6, type: !12) +!20 = !DILocalVariable(name: "local", line: 10, scope: !4, file: !6, type: !12) !21 = !DILocation(line: 10, scope: !4) !22 = !DILocation(line: 11, scope: !4) diff --git a/llvm/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll b/llvm/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll index 86a1647d6fa..958f12199d0 100644 --- a/llvm/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll +++ b/llvm/test/DebugInfo/X86/stmt-list-multiple-compile-units.ll @@ -93,11 +93,11 @@ entry: !11 = !{!13} !13 = !DISubprogram(name: "fn", line: 1, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 1, file: !24, scope: !14, type: !7, function: i32 (i32)* @fn, variables: !1) !14 = !DIFile(filename: "simple2.c", directory: "/private/tmp") -!15 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "a", line: 2, arg: 1, scope: !5, file: !6, type: !9) +!15 = !DILocalVariable(name: "a", line: 2, arg: 1, scope: !5, file: !6, type: !9) !16 = !DILocation(line: 2, scope: !5) !17 = !DILocation(line: 4, scope: !18) !18 = distinct !DILexicalBlock(line: 3, column: 0, file: !23, scope: !5) -!19 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "a", line: 1, arg: 1, scope: !13, file: !14, type: !9) +!19 = !DILocalVariable(name: "a", line: 1, arg: 1, scope: !13, file: !14, type: !9) !20 = !DILocation(line: 1, scope: !13) !21 = !DILocation(line: 2, scope: !22) !22 = distinct !DILexicalBlock(line: 1, column: 0, file: !24, scope: !13) diff --git a/llvm/test/DebugInfo/X86/subrange-type.ll b/llvm/test/DebugInfo/X86/subrange-type.ll index d83cca6c877..1b0160479b0 100644 --- a/llvm/test/DebugInfo/X86/subrange-type.ll +++ b/llvm/test/DebugInfo/X86/subrange-type.ll @@ -29,7 +29,7 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !7 = !DISubroutineType(types: !8) !8 = !{!9} !9 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -!10 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "i", line: 4, scope: !11, file: !6, type: !12) +!10 = !DILocalVariable(name: "i", line: 4, scope: !11, file: !6, type: !12) !11 = distinct !DILexicalBlock(line: 3, column: 0, file: !6, scope: !5) !12 = !DICompositeType(tag: DW_TAG_array_type, size: 64, align: 32, baseType: !9, elements: !13) !13 = !{!14} diff --git a/llvm/test/DebugInfo/X86/subreg.ll b/llvm/test/DebugInfo/X86/subreg.ll index b850ce800e3..608f0d8a51e 100644 --- a/llvm/test/DebugInfo/X86/subreg.ll +++ b/llvm/test/DebugInfo/X86/subreg.ll @@ -21,7 +21,7 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !llvm.module.flags = !{!11} !9 = !{!1} -!0 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "zzz", line: 3, arg: 1, scope: !1, file: !2, type: !6) +!0 = !DILocalVariable(name: "zzz", line: 3, arg: 1, scope: !1, file: !2, type: !6) !1 = !DISubprogram(name: "f", line: 3, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 3, file: !10, scope: !2, type: !4, function: i16 (i16)* @f) !2 = !DIFile(filename: "/home/espindola/llvm/test.c", directory: "/home/espindola/tmpfs/build") !3 = !DICompileUnit(language: DW_LANG_C99, producer: "clang version 3.0 ()", isOptimized: false, emissionKind: 1, file: !10, enums: !{}, retainedTypes: !{}, subprograms: !9, imports: null) diff --git a/llvm/test/DebugInfo/X86/subregisters.ll b/llvm/test/DebugInfo/X86/subregisters.ll index a4722aa8cd5..94bc58377cc 100644 --- a/llvm/test/DebugInfo/X86/subregisters.ll +++ b/llvm/test/DebugInfo/X86/subregisters.ll @@ -93,13 +93,13 @@ attributes #4 = { nounwind } !12 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !13 = !DIDerivedType(tag: DW_TAG_member, name: "b", line: 5, size: 32, align: 32, offset: 32, file: !1, scope: !9, baseType: !12) !14 = !{!15, !16} -!15 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "b", line: 10, arg: 1, scope: !4, file: !5, type: !8) -!16 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "a", line: 12, scope: !4, file: !5, type: !12) +!15 = !DILocalVariable(name: "b", line: 10, arg: 1, scope: !4, file: !5, type: !8) +!16 = !DILocalVariable(name: "a", line: 12, scope: !4, file: !5, type: !12) !17 = !DISubprogram(name: "main", line: 16, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: true, scopeLine: 17, file: !1, scope: !5, type: !18, function: i32 ()* @main, variables: !20) !18 = !DISubroutineType(types: !19) !19 = !{!12} !20 = !{!21} -!21 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "myBar", line: 18, scope: !17, file: !5, type: !9) +!21 = !DILocalVariable(name: "myBar", line: 18, scope: !17, file: !5, type: !9) !22 = !{i32 2, !"Dwarf Version", i32 2} !23 = !{i32 1, !"Debug Info Version", i32 3} !24 = !{!"clang version 3.5 "} diff --git a/llvm/test/DebugInfo/X86/union-const.ll b/llvm/test/DebugInfo/X86/union-const.ll index e051c6297b7..70b03b3fdaf 100644 --- a/llvm/test/DebugInfo/X86/union-const.ll +++ b/llvm/test/DebugInfo/X86/union-const.ll @@ -56,7 +56,7 @@ attributes #1 = { nounwind readnone } !13 = !DIDerivedType(tag: DW_TAG_member, name: "reserved", line: 3, size: 32, align: 32, file: !1, scope: !11, baseType: !14) !14 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !15 = !{!16} -!16 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "a", line: 6, scope: !4, file: !5, type: !8) +!16 = !DILocalVariable(name: "a", line: 6, scope: !4, file: !5, type: !8) !17 = !{i32 2, !"Dwarf Version", i32 2} !18 = !{i32 2, !"Debug Info Version", i32 3} !19 = !{i32 1, !"PIC Level", i32 2} diff --git a/llvm/test/DebugInfo/X86/union-template.ll b/llvm/test/DebugInfo/X86/union-template.ll index 172dcdcbb9d..8f5bde84412 100644 --- a/llvm/test/DebugInfo/X86/union-template.ll +++ b/llvm/test/DebugInfo/X86/union-template.ll @@ -51,9 +51,9 @@ attributes #1 = { nounwind readnone } !19 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, flags: DIFlagArtificial | DIFlagObjectPointer, baseType: !12) !21 = !{!22} !22 = !DITemplateTypeParameter(name: "T", type: !8) -!23 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "value", line: 3, arg: 1, scope: !4, file: !11, type: !8) +!23 = !DILocalVariable(name: "value", line: 3, arg: 1, scope: !4, file: !11, type: !8) !24 = !DILocation(line: 3, scope: !4) -!25 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "tempValue", line: 4, scope: !4, file: !11, type: !12) +!25 = !DILocalVariable(name: "tempValue", line: 4, scope: !4, file: !11, type: !12) !26 = !DILocation(line: 4, scope: !4) !27 = !DILocation(line: 5, scope: !4) !28 = !{i32 1, !"Debug Info Version", i32 3} diff --git a/llvm/test/DebugInfo/X86/vla.ll b/llvm/test/DebugInfo/X86/vla.ll index dfcc5f1cce2..5b7ca5fff09 100644 --- a/llvm/test/DebugInfo/X86/vla.ll +++ b/llvm/test/DebugInfo/X86/vla.ll @@ -90,18 +90,18 @@ entry: !12 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !13) !13 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !14) !14 = !DIBasicType(tag: DW_TAG_base_type, name: "char", size: 8, align: 8, encoding: DW_ATE_signed_char) -!15 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "n", line: 1, arg: 1, scope: !4, file: !5, type: !8) +!15 = !DILocalVariable(name: "n", line: 1, arg: 1, scope: !4, file: !5, type: !8) !16 = !DILocation(line: 1, scope: !4) !17 = !DILocation(line: 2, scope: !4) -!18 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "a", line: 2, scope: !4, file: !5, type: !19) +!18 = !DILocalVariable(name: "a", line: 2, scope: !4, file: !5, type: !19) !19 = !DICompositeType(tag: DW_TAG_array_type, align: 32, baseType: !8, elements: !20) !20 = !{!21} !21 = !DISubrange(count: -1) !22 = !DILocation(line: 3, scope: !4) !23 = !DILocation(line: 4, scope: !4) !24 = !DILocation(line: 5, scope: !4) -!25 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "argc", line: 7, arg: 1, scope: !9, file: !5, type: !8) +!25 = !DILocalVariable(name: "argc", line: 7, arg: 1, scope: !9, file: !5, type: !8) !26 = !DILocation(line: 7, scope: !9) -!27 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "argv", line: 7, arg: 2, scope: !9, file: !5, type: !12) +!27 = !DILocalVariable(name: "argv", line: 7, arg: 2, scope: !9, file: !5, type: !12) !28 = !DILocation(line: 8, scope: !9) !29 = !{i32 1, !"Debug Info Version", i32 3} diff --git a/llvm/test/DebugInfo/array.ll b/llvm/test/DebugInfo/array.ll index f6c79f77c6f..1d86b290808 100644 --- a/llvm/test/DebugInfo/array.ll +++ b/llvm/test/DebugInfo/array.ll @@ -21,7 +21,7 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !3 = !DISubroutineType(types: !4) !4 = !{!5} !5 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -!6 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "a", line: 4, scope: !7, file: !1, type: !8) +!6 = !DILocalVariable(name: "a", line: 4, scope: !7, file: !1, type: !8) !7 = distinct !DILexicalBlock(line: 3, column: 12, file: !14, scope: !0) !8 = !DICompositeType(tag: DW_TAG_array_type, align: 32, file: !14, scope: !2, baseType: !5, elements: !9) !9 = !{!10} diff --git a/llvm/test/DebugInfo/block-asan.ll b/llvm/test/DebugInfo/block-asan.ll index 393816b3485..4292f0d828f 100644 --- a/llvm/test/DebugInfo/block-asan.ll +++ b/llvm/test/DebugInfo/block-asan.ll @@ -70,7 +70,7 @@ attributes #3 = { nounwind } !9 = !{i32 2, !"Debug Info Version", i32 3} !10 = !{i32 1, !"PIC Level", i32 2} !11 = !{!"clang version 3.6.0 (trunk 223120) (llvm/trunk 223119)"} -!12 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "x", line: 4, scope: !4, file: !5, type: !13) +!12 = !DILocalVariable(name: "x", line: 4, scope: !4, file: !5, type: !13) !13 = !DICompositeType(tag: DW_TAG_structure_type, size: 224, flags: DIFlagBlockByrefStruct, file: !1, scope: !5, elements: !14) !14 = !{!15, !17, !18, !20, !21} !15 = !DIDerivedType(tag: DW_TAG_member, name: "__isa", size: 64, align: 64, file: !1, scope: !5, baseType: !16) diff --git a/llvm/test/DebugInfo/cross-cu-inlining.ll b/llvm/test/DebugInfo/cross-cu-inlining.ll index 436bdda6473..63da965a420 100644 --- a/llvm/test/DebugInfo/cross-cu-inlining.ll +++ b/llvm/test/DebugInfo/cross-cu-inlining.ll @@ -132,9 +132,9 @@ attributes #3 = { nounwind } !17 = !{i32 2, !"Debug Info Version", i32 3} !18 = !{!"clang version 3.5.0 "} !19 = !DILocation(line: 4, scope: !4) -!20 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "x", line: 1, arg: 1, scope: !12, file: !13, type: !8) +!20 = !DILocalVariable(name: "x", line: 1, arg: 1, scope: !12, file: !13, type: !8) -!120 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "x", line: 1, arg: 1, scope: !12, file: !13, type: !8) +!120 = !DILocalVariable(name: "x", line: 1, arg: 1, scope: !12, file: !13, type: !8) !21 = !DILocation(line: 1, scope: !12, inlinedAt: !19) !22 = !DILocation(line: 2, scope: !12, inlinedAt: !19) diff --git a/llvm/test/DebugInfo/cross-cu-linkonce-distinct.ll b/llvm/test/DebugInfo/cross-cu-linkonce-distinct.ll index b8ce57e7035..3a76f0a896e 100644 --- a/llvm/test/DebugInfo/cross-cu-linkonce-distinct.ll +++ b/llvm/test/DebugInfo/cross-cu-linkonce-distinct.ll @@ -90,6 +90,6 @@ attributes #1 = { nounwind readnone } !19 = !{i32 2, !"Dwarf Version", i32 4} !20 = !{i32 1, !"Debug Info Version", i32 3} !21 = !{!"clang version 3.5.0 "} -!22 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "i", line: 1, arg: 1, scope: !4, file: !5, type: !8) +!22 = !DILocalVariable(name: "i", line: 1, arg: 1, scope: !4, file: !5, type: !8) !23 = !DILocation(line: 1, scope: !4) !24 = !DILocation(line: 2, scope: !4) diff --git a/llvm/test/DebugInfo/cross-cu-linkonce.ll b/llvm/test/DebugInfo/cross-cu-linkonce.ll index 3638825fc9c..3b35cf5ae54 100644 --- a/llvm/test/DebugInfo/cross-cu-linkonce.ll +++ b/llvm/test/DebugInfo/cross-cu-linkonce.ll @@ -68,6 +68,6 @@ attributes #1 = { nounwind readnone } !17 = !{i32 2, !"Dwarf Version", i32 4} !18 = !{i32 1, !"Debug Info Version", i32 3} !19 = !{!"clang version 3.5.0 "} -!20 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "i", line: 1, arg: 1, scope: !4, file: !6, type: !9) +!20 = !DILocalVariable(name: "i", line: 1, arg: 1, scope: !4, file: !6, type: !9) !21 = !DILocation(line: 1, scope: !4) !22 = !DILocation(line: 2, scope: !4) diff --git a/llvm/test/DebugInfo/cu-range-hole.ll b/llvm/test/DebugInfo/cu-range-hole.ll index 19a305483fb..f6251732aa8 100644 --- a/llvm/test/DebugInfo/cu-range-hole.ll +++ b/llvm/test/DebugInfo/cu-range-hole.ll @@ -68,7 +68,7 @@ attributes #1 = { nounwind readnone } !10 = !DISubprogram(name: "d", line: 3, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 3, file: !2, scope: !6, type: !7, function: i32 (i32)* @d, variables: !3) !11 = !{i32 2, !"Dwarf Version", i32 4} !12 = !{i32 1, !"Debug Info Version", i32 3} -!13 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "c", line: 1, arg: 1, scope: !5, file: !6, type: !9) +!13 = !DILocalVariable(name: "c", line: 1, arg: 1, scope: !5, file: !6, type: !9) !14 = !DILocation(line: 1, scope: !5) -!15 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "e", line: 3, arg: 1, scope: !10, file: !6, type: !9) +!15 = !DILocalVariable(name: "e", line: 3, arg: 1, scope: !10, file: !6, type: !9) !16 = !DILocation(line: 3, scope: !10) diff --git a/llvm/test/DebugInfo/cu-ranges.ll b/llvm/test/DebugInfo/cu-ranges.ll index 3cec5c88f38..cd21302ac79 100644 --- a/llvm/test/DebugInfo/cu-ranges.ll +++ b/llvm/test/DebugInfo/cu-ranges.ll @@ -62,10 +62,10 @@ attributes #1 = { nounwind readnone } !10 = !{i32 2, !"Dwarf Version", i32 4} !11 = !{i32 1, !"Debug Info Version", i32 3} !12 = !{!"clang version 3.5.0 (trunk 204164) (llvm/trunk 204183)"} -!13 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "a", line: 1, arg: 1, scope: !4, file: !5, type: !8) +!13 = !DILocalVariable(name: "a", line: 1, arg: 1, scope: !4, file: !5, type: !8) !14 = !DILocation(line: 1, scope: !4) !15 = !DILocation(line: 2, scope: !4) -!16 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "a", line: 5, arg: 1, scope: !9, file: !5, type: !8) +!16 = !DILocalVariable(name: "a", line: 5, arg: 1, scope: !9, file: !5, type: !8) !17 = !DILocation(line: 5, scope: !9) !18 = !DILocation(line: 6, scope: !9) diff --git a/llvm/test/DebugInfo/dead-argument-order.ll b/llvm/test/DebugInfo/dead-argument-order.ll index 2dd556d096d..2573fb4a681 100644 --- a/llvm/test/DebugInfo/dead-argument-order.ll +++ b/llvm/test/DebugInfo/dead-argument-order.ll @@ -71,8 +71,8 @@ attributes #1 = { nounwind readnone } !11 = !DISubroutineType(types: !12) !12 = !{!7, !4, !7} !13 = !{!14, !15} -!14 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "s", line: 2, arg: 1, scope: !9, file: !10, type: !"_ZTS1S") -!15 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "i", line: 2, arg: 2, scope: !9, file: !10, type: !7) +!14 = !DILocalVariable(name: "s", line: 2, arg: 1, scope: !9, file: !10, type: !"_ZTS1S") +!15 = !DILocalVariable(name: "i", line: 2, arg: 2, scope: !9, file: !10, type: !7) !16 = !{i32 2, !"Dwarf Version", i32 4} !17 = !{i32 2, !"Debug Info Version", i32 3} !18 = !{!"clang version 3.5.0 "} diff --git a/llvm/test/DebugInfo/debug-info-qualifiers.ll b/llvm/test/DebugInfo/debug-info-qualifiers.ll index 1f8f6c41993..54d7f7e867b 100644 --- a/llvm/test/DebugInfo/debug-info-qualifiers.ll +++ b/llvm/test/DebugInfo/debug-info-qualifiers.ll @@ -83,15 +83,15 @@ attributes #1 = { nounwind readnone } !21 = !{i32 2, !"Dwarf Version", i32 4} !22 = !{i32 1, !"Debug Info Version", i32 3} !23 = !{!"clang version 3.5 "} -!24 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "a", line: 11, scope: !17, file: !18, type: !4) +!24 = !DILocalVariable(name: "a", line: 11, scope: !17, file: !18, type: !4) !25 = !DILocation(line: 11, scope: !17) -!26 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "pl", line: 16, scope: !17, file: !18, type: !27) +!26 = !DILocalVariable(name: "pl", line: 16, scope: !17, file: !18, type: !27) !27 = !DIDerivedType(tag: DW_TAG_ptr_to_member_type, baseType: !28, extraData: !"_ZTS1A") !28 = !DISubroutineType(flags: DIFlagLValueReference, types: !29) !29 = !{null, !30} !30 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, flags: DIFlagArtificial | DIFlagObjectPointer, baseType: !"_ZTS1A") !31 = !DILocation(line: 16, scope: !17) -!32 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "pr", line: 21, scope: !17, file: !18, type: !33) +!32 = !DILocalVariable(name: "pr", line: 21, scope: !17, file: !18, type: !33) !33 = !DIDerivedType(tag: DW_TAG_ptr_to_member_type, baseType: !34, extraData: !"_ZTS1A") !34 = !DISubroutineType(flags: DIFlagRValueReference, types: !29) !35 = !DILocation(line: 21, scope: !17) diff --git a/llvm/test/DebugInfo/dwarf-public-names.ll b/llvm/test/DebugInfo/dwarf-public-names.ll index bd340578bfb..a4ee3fd1f91 100644 --- a/llvm/test/DebugInfo/dwarf-public-names.ll +++ b/llvm/test/DebugInfo/dwarf-public-names.ll @@ -118,7 +118,7 @@ attributes #1 = { nounwind readnone } !25 = !DIGlobalVariable(name: "static_member_variable", linkageName: "_ZN1C22static_member_variableE", line: 7, isLocal: false, isDefinition: true, scope: !8, file: !4, type: !11, variable: i32* @_ZN1C22static_member_variableE, declaration: !10) !26 = !DIGlobalVariable(name: "global_variable", line: 17, isLocal: false, isDefinition: true, scope: null, file: !4, type: !8, variable: %struct.C* @global_variable) !27 = !DIGlobalVariable(name: "global_namespace_variable", linkageName: "_ZN2ns25global_namespace_variableE", line: 27, isLocal: false, isDefinition: true, scope: !21, file: !4, type: !11, variable: i32* @_ZN2ns25global_namespace_variableE) -!28 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 9, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !3, file: !4, type: !29) +!28 = !DILocalVariable(name: "this", line: 9, arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !3, file: !4, type: !29) !29 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !8) !30 = !DILocation(line: 9, scope: !3) !31 = !DILocation(line: 10, scope: !3) diff --git a/llvm/test/DebugInfo/enum-types.ll b/llvm/test/DebugInfo/enum-types.ll index 7b50f5e9087..6e15ef31b25 100644 --- a/llvm/test/DebugInfo/enum-types.ll +++ b/llvm/test/DebugInfo/enum-types.ll @@ -70,9 +70,9 @@ attributes #1 = { nounwind readnone } !19 = !{i32 2, !"Dwarf Version", i32 2} !20 = !{i32 2, !"Debug Info Version", i32 3} !21 = !{!"clang version 3.5.0 (trunk 214102:214133) (llvm/trunk 214102:214132)"} -!22 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "sa", line: 5, arg: 1, scope: !7, file: !8, type: !"_ZTS2EA") +!22 = !DILocalVariable(name: "sa", line: 5, arg: 1, scope: !7, file: !8, type: !"_ZTS2EA") !23 = !DILocation(line: 5, column: 14, scope: !7) !24 = !DILocation(line: 6, column: 1, scope: !7) -!25 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "sa", line: 5, arg: 1, scope: !17, file: !18, type: !"_ZTS2EA") +!25 = !DILocalVariable(name: "sa", line: 5, arg: 1, scope: !17, file: !18, type: !"_ZTS2EA") !26 = !DILocation(line: 5, column: 14, scope: !17) !27 = !DILocation(line: 6, column: 1, scope: !17) diff --git a/llvm/test/DebugInfo/enum.ll b/llvm/test/DebugInfo/enum.ll index fd07a92ae41..bd4f96982c1 100644 --- a/llvm/test/DebugInfo/enum.ll +++ b/llvm/test/DebugInfo/enum.ll @@ -73,7 +73,7 @@ attributes #1 = { nounwind readnone } !17 = !{!18} !18 = !DIGlobalVariable(name: "a", line: 1, isLocal: false, isDefinition: true, scope: null, file: !14, type: !3, variable: i64* @a) !19 = !{i32 2, !"Dwarf Version", i32 3} -!20 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "b", line: 4, scope: !13, file: !14, type: !21) +!20 = !DILocalVariable(name: "b", line: 4, scope: !13, file: !14, type: !21) !21 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !22 = !DILocation(line: 4, scope: !13) !23 = !DILocation(line: 5, scope: !13) diff --git a/llvm/test/DebugInfo/incorrect-variable-debugloc.ll b/llvm/test/DebugInfo/incorrect-variable-debugloc.ll index 930f8c92cf6..8ecd324db7b 100644 --- a/llvm/test/DebugInfo/incorrect-variable-debugloc.ll +++ b/llvm/test/DebugInfo/incorrect-variable-debugloc.ll @@ -363,14 +363,14 @@ attributes #3 = { nounwind readnone } !24 = !DISubroutineType(types: !25) !25 = !{!8} !26 = !{!27} -!27 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "A", line: 17, scope: !22, file: !23, type: !"_ZTS1C") +!27 = !DILocalVariable(name: "A", line: 17, scope: !22, file: !23, type: !"_ZTS1C") !28 = !DISubprogram(name: "m_fn3", linkageName: "_ZN1C5m_fn3Ev", line: 21, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 21, file: !5, scope: !"_ZTS1C", type: !11, function: void (%struct.C*)* @_ZN1C5m_fn3Ev, declaration: !10, variables: !29) !29 = !{!30} -!30 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !28, type: !31) +!30 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !28, type: !31) !31 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !"_ZTS1C") !32 = !DISubprogram(name: "m_fn2", linkageName: "_ZN1B5m_fn2Ev", line: 6, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 6, file: !5, scope: !"_ZTS1B", type: !18, declaration: !17, variables: !33) !33 = !{!34} -!34 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !32, type: !35) +!34 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !32, type: !35) !35 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !"_ZTS1B") !36 = !{i32 2, !"Dwarf Version", i32 4} !37 = !{i32 2, !"Debug Info Version", i32 3} diff --git a/llvm/test/DebugInfo/incorrect-variable-debugloc1.ll b/llvm/test/DebugInfo/incorrect-variable-debugloc1.ll index 3ece94ac888..f605be0649a 100644 --- a/llvm/test/DebugInfo/incorrect-variable-debugloc1.ll +++ b/llvm/test/DebugInfo/incorrect-variable-debugloc1.ll @@ -63,7 +63,7 @@ attributes #2 = { nounwind readnone } !7 = !{!8} !8 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !9 = !{!10} -!10 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "c", line: 5, scope: !4, file: !5, type: !11) +!10 = !DILocalVariable(name: "c", line: 5, scope: !4, file: !5, type: !11) !11 = !DIDerivedType(tag: DW_TAG_volatile_type, baseType: !8) !12 = !{i32 2, !"Dwarf Version", i32 2} !13 = !{i32 2, !"Debug Info Version", i32 3} diff --git a/llvm/test/DebugInfo/inheritance.ll b/llvm/test/DebugInfo/inheritance.ll index 10d799b54f7..3a76074a428 100644 --- a/llvm/test/DebugInfo/inheritance.ll +++ b/llvm/test/DebugInfo/inheritance.ll @@ -105,7 +105,7 @@ return: ; preds = %bb2 declare void @_ZdlPv(i8*) nounwind -!0 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "tst", line: 13, scope: !1, file: !4, type: !8) +!0 = !DILocalVariable(name: "tst", line: 13, scope: !1, file: !4, type: !8) !1 = distinct !DILexicalBlock(line: 0, column: 0, file: !44, scope: !2) !2 = distinct !DILexicalBlock(line: 0, column: 0, file: !44, scope: !3) !3 = !DISubprogram(name: "main", linkageName: "main", line: 11, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, scope: !4, type: !5) @@ -129,7 +129,7 @@ declare void @_ZdlPv(i8*) nounwind !21 = !DILocation(line: 11, scope: !1) !22 = !DILocation(line: 13, scope: !1) !23 = !DILocation(line: 14, scope: !1) -!24 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 13, arg: 1, scope: !25, file: !4, type: !26) +!24 = !DILocalVariable(name: "this", line: 13, arg: 1, scope: !25, file: !4, type: !26) !25 = !DISubprogram(name: "test1", linkageName: "_ZN5test1C1Ev", line: 1, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, scope: !4, type: !15) !26 = !DIDerivedType(tag: DW_TAG_const_type, size: 64, align: 64, flags: DIFlagArtificial, file: !4, baseType: !27) !27 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, file: !4, baseType: !8) @@ -137,13 +137,13 @@ declare void @_ZdlPv(i8*) nounwind !29 = !DILocation(line: 1, scope: !30) !30 = distinct !DILexicalBlock(line: 0, column: 0, file: !44, scope: !31) !31 = distinct !DILexicalBlock(line: 0, column: 0, file: !44, scope: !25) -!32 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 4, arg: 1, scope: !33, file: !4, type: !26) +!32 = !DILocalVariable(name: "this", line: 4, arg: 1, scope: !33, file: !4, type: !26) !33 = !DISubprogram(name: "~test1", linkageName: "_ZN5test1D1Ev", line: 4, isLocal: false, isDefinition: true, virtuality: DW_VIRTUALITY_virtual, virtualIndex: 6, isOptimized: false, scope: !8, type: !15, containingType: !8) !34 = !DILocation(line: 4, scope: !33) !35 = !DILocation(line: 5, scope: !36) !36 = distinct !DILexicalBlock(line: 0, column: 0, file: !44, scope: !33) !37 = !DILocation(line: 6, scope: !36) -!38 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", line: 4, arg: 1, scope: !39, file: !4, type: !26) +!38 = !DILocalVariable(name: "this", line: 4, arg: 1, scope: !39, file: !4, type: !26) !39 = !DISubprogram(name: "~test1", linkageName: "_ZN5test1D0Ev", line: 4, isLocal: false, isDefinition: true, virtuality: DW_VIRTUALITY_virtual, virtualIndex: 6, isOptimized: false, scope: !8, type: !15, containingType: !8) !40 = !DILocation(line: 4, scope: !39) !41 = !DILocation(line: 5, scope: !42) diff --git a/llvm/test/DebugInfo/inline-debug-info-multiret.ll b/llvm/test/DebugInfo/inline-debug-info-multiret.ll index d86e6abbd80..11ceb13e35f 100644 --- a/llvm/test/DebugInfo/inline-debug-info-multiret.ll +++ b/llvm/test/DebugInfo/inline-debug-info-multiret.ll @@ -135,9 +135,9 @@ attributes #2 = { nounwind } !10 = !DISubprogram(name: "test2", linkageName: "_Z5test2v", line: 11, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 11, file: !5, scope: !6, type: !11, function: i32 ()* @_Z5test2v, variables: !2) !11 = !DISubroutineType(types: !12) !12 = !{!9} -!13 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "k", line: 4, arg: 1, scope: !4, file: !6, type: !9) +!13 = !DILocalVariable(name: "k", line: 4, arg: 1, scope: !4, file: !6, type: !9) !14 = !DILocation(line: 4, scope: !4) -!15 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "k2", line: 5, scope: !4, file: !6, type: !9) +!15 = !DILocalVariable(name: "k2", line: 5, scope: !4, file: !6, type: !9) !16 = !DILocation(line: 5, scope: !4) !17 = !DILocation(line: 6, scope: !4) !18 = !DILocation(line: 7, scope: !4) @@ -146,7 +146,7 @@ attributes #2 = { nounwind } !21 = !DILocation(line: 14, scope: !22) !22 = distinct !DILexicalBlock(line: 13, column: 0, file: !5, scope: !10) !23 = !DILocation(line: 15, scope: !22) -!24 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "e", line: 16, scope: !10, file: !6, type: !9) +!24 = !DILocalVariable(name: "e", line: 16, scope: !10, file: !6, type: !9) !25 = !DILocation(line: 16, scope: !10) !26 = !DILocation(line: 17, scope: !27) !27 = distinct !DILexicalBlock(line: 16, column: 0, file: !5, scope: !10) diff --git a/llvm/test/DebugInfo/inline-debug-info.ll b/llvm/test/DebugInfo/inline-debug-info.ll index 908093ca255..7230bebebad 100644 --- a/llvm/test/DebugInfo/inline-debug-info.ll +++ b/llvm/test/DebugInfo/inline-debug-info.ll @@ -153,9 +153,9 @@ attributes #2 = { nounwind } !10 = !DISubprogram(name: "test2", linkageName: "_Z5test2v", line: 11, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 11, file: !5, scope: !6, type: !11, function: i32 ()* @_Z5test2v, variables: !2) !11 = !DISubroutineType(types: !12) !12 = !{!9} -!13 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "k", line: 4, arg: 1, scope: !4, file: !6, type: !9) +!13 = !DILocalVariable(name: "k", line: 4, arg: 1, scope: !4, file: !6, type: !9) !14 = !DILocation(line: 4, scope: !4) -!15 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "k2", line: 5, scope: !4, file: !6, type: !9) +!15 = !DILocalVariable(name: "k2", line: 5, scope: !4, file: !6, type: !9) !16 = !DILocation(line: 5, scope: !4) !17 = !DILocation(line: 6, scope: !4) !18 = !DILocation(line: 7, scope: !4) @@ -164,7 +164,7 @@ attributes #2 = { nounwind } !21 = !DILocation(line: 14, scope: !22) !22 = distinct !DILexicalBlock(line: 13, column: 0, file: !5, scope: !10) !23 = !DILocation(line: 15, scope: !22) -!24 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "e", line: 16, scope: !10, file: !6, type: !9) +!24 = !DILocalVariable(name: "e", line: 16, scope: !10, file: !6, type: !9) !25 = !DILocation(line: 16, scope: !10) !26 = !DILocation(line: 17, scope: !27) !27 = distinct !DILexicalBlock(line: 16, column: 0, file: !5, scope: !10) diff --git a/llvm/test/DebugInfo/inline-scopes.ll b/llvm/test/DebugInfo/inline-scopes.ll index 45324f6a4b9..46e08bcc2dd 100644 --- a/llvm/test/DebugInfo/inline-scopes.ll +++ b/llvm/test/DebugInfo/inline-scopes.ll @@ -111,7 +111,7 @@ attributes #2 = { "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "n !13 = !{i32 2, !"Dwarf Version", i32 4} !14 = !{i32 1, !"Debug Info Version", i32 3} !15 = !{!"clang version 3.5.0 "} -!16 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "b", line: 3, scope: !17, file: !11, type: !18) +!16 = !DILocalVariable(name: "b", line: 3, scope: !17, file: !11, type: !18) !17 = distinct !DILexicalBlock(line: 3, column: 0, file: !1, scope: !12) !18 = !DIBasicType(tag: DW_TAG_base_type, name: "bool", size: 8, align: 8, encoding: DW_ATE_boolean) !19 = !DILocation(line: 3, scope: !17, inlinedAt: !20) @@ -119,7 +119,7 @@ attributes #2 = { "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "n !21 = !DILocation(line: 4, scope: !17, inlinedAt: !20) !22 = !DILocation(line: 5, scope: !12, inlinedAt: !20) !23 = !DILocation(line: 6, scope: !12, inlinedAt: !20) -!24 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "b", line: 2, scope: !25, file: !6, type: !18) +!24 = !DILocalVariable(name: "b", line: 2, scope: !25, file: !6, type: !18) !25 = distinct !DILexicalBlock(line: 2, column: 0, file: !5, scope: !26) !26 = !DILexicalBlockFile(discriminator: 0, file: !5, scope: !10) !27 = !DILocation(line: 2, scope: !25, inlinedAt: !28) diff --git a/llvm/test/DebugInfo/inlined-arguments.ll b/llvm/test/DebugInfo/inlined-arguments.ll index 912ebb1321e..76a82427ad3 100644 --- a/llvm/test/DebugInfo/inlined-arguments.ll +++ b/llvm/test/DebugInfo/inlined-arguments.ll @@ -63,14 +63,14 @@ attributes #2 = { nounwind readnone } !10 = !{null, !11, !11} !11 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !12 = !{!13, !14} -!13 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "x", line: 6, arg: 1, scope: !8, file: !5, type: !11) -!14 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "y", line: 6, arg: 2, scope: !8, file: !5, type: !11) +!13 = !DILocalVariable(name: "x", line: 6, arg: 1, scope: !8, file: !5, type: !11) +!14 = !DILocalVariable(name: "y", line: 6, arg: 2, scope: !8, file: !5, type: !11) !15 = !{i32 undef} -!16 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "x", line: 6, arg: 1, scope: !8, file: !5, type: !11) +!16 = !DILocalVariable(name: "x", line: 6, arg: 1, scope: !8, file: !5, type: !11) !17 = !DILocation(line: 4, scope: !4) !18 = !DILocation(line: 6, scope: !8, inlinedAt: !17) !19 = !{i32 2} -!20 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "y", line: 6, arg: 2, scope: !8, file: !5, type: !11) +!20 = !DILocalVariable(name: "y", line: 6, arg: 2, scope: !8, file: !5, type: !11) !21 = !DILocation(line: 7, scope: !8, inlinedAt: !17) !22 = !DILocation(line: 5, scope: !4) !23 = !DILocation(line: 6, scope: !8) diff --git a/llvm/test/DebugInfo/inlined-vars.ll b/llvm/test/DebugInfo/inlined-vars.ll index 8c782374886..875b57b284a 100644 --- a/llvm/test/DebugInfo/inlined-vars.ll +++ b/llvm/test/DebugInfo/inlined-vars.ll @@ -31,24 +31,24 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !11 = !DISubroutineType(types: !12) !12 = !{!9, !9} !13 = !{!15, !16} -!15 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "argument", line: 3, arg: 1, scope: !10, file: !6, type: !9) +!15 = !DILocalVariable(name: "argument", line: 3, arg: 1, scope: !10, file: !6, type: !9) ; Two DW_TAG_formal_parameter: one abstract and one inlined. ; ARGUMENT: {{.*Abbrev.*DW_TAG_formal_parameter}} ; ARGUMENT: {{.*Abbrev.*DW_TAG_formal_parameter}} ; ARGUMENT-NOT: {{.*Abbrev.*DW_TAG_formal_parameter}} -!16 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "local", line: 4, scope: !10, file: !6, type: !9) +!16 = !DILocalVariable(name: "local", line: 4, scope: !10, file: !6, type: !9) ; Two DW_TAG_variable: one abstract and one inlined. ; VARIABLE: {{.*Abbrev.*DW_TAG_variable}} ; VARIABLE: {{.*Abbrev.*DW_TAG_variable}} ; VARIABLE-NOT: {{.*Abbrev.*DW_TAG_variable}} -!18 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "argument", line: 3, arg: 1, scope: !10, file: !6, type: !9) +!18 = !DILocalVariable(name: "argument", line: 3, arg: 1, scope: !10, file: !6, type: !9) !19 = !DILocation(line: 11, column: 10, scope: !5) !21 = !DILocation(line: 3, column: 25, scope: !10, inlinedAt: !19) -!22 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "local", line: 4, scope: !10, file: !6, type: !9) +!22 = !DILocalVariable(name: "local", line: 4, scope: !10, file: !6, type: !9) !23 = !DILocation(line: 4, column: 16, scope: !10, inlinedAt: !19) !24 = !DILocation(line: 5, column: 3, scope: !10, inlinedAt: !19) !25 = !DILocation(line: 6, column: 3, scope: !10, inlinedAt: !19) diff --git a/llvm/test/DebugInfo/member-order.ll b/llvm/test/DebugInfo/member-order.ll index f07e4f85cde..641d25b171d 100644 --- a/llvm/test/DebugInfo/member-order.ll +++ b/llvm/test/DebugInfo/member-order.ll @@ -59,7 +59,7 @@ attributes #1 = { nounwind readnone } !13 = !{!14} !14 = !DISubprogram(name: "f1", linkageName: "_ZN3foo2f1Ev", line: 6, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 6, file: !1, scope: null, type: !7, function: void (%struct.foo*)* @_ZN3foo2f1Ev, declaration: !6, variables: !2) !15 = !{i32 2, !"Dwarf Version", i32 4} -!16 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !14, type: !17) +!16 = !DILocalVariable(name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !14, type: !17) !17 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !"_ZTS3foo") !18 = !DILocation(line: 0, scope: !14) !19 = !DILocation(line: 7, scope: !14) diff --git a/llvm/test/DebugInfo/missing-abstract-variable.ll b/llvm/test/DebugInfo/missing-abstract-variable.ll index 8a576c2bfd3..95ba7f9240b 100644 --- a/llvm/test/DebugInfo/missing-abstract-variable.ll +++ b/llvm/test/DebugInfo/missing-abstract-variable.ll @@ -148,11 +148,11 @@ attributes #2 = { nounwind readnone } !10 = !{null, !11} !11 = !DIBasicType(tag: DW_TAG_base_type, name: "bool", size: 8, align: 8, encoding: DW_ATE_boolean) !12 = !{!13} -!13 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "u", line: 17, arg: 1, scope: !8, file: !5, type: !11) +!13 = !DILocalVariable(name: "u", line: 17, arg: 1, scope: !8, file: !5, type: !11) !14 = !DISubprogram(name: "x", linkageName: "_Z1xb", line: 5, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: true, scopeLine: 5, file: !1, scope: !5, type: !9, variables: !15) !15 = !{!16, !17} -!16 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "b", line: 5, arg: 1, scope: !14, file: !5, type: !11) -!17 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "s", line: 7, scope: !18, file: !5, type: !20) +!16 = !DILocalVariable(name: "b", line: 5, arg: 1, scope: !14, file: !5, type: !11) +!17 = !DILocalVariable(name: "s", line: 7, scope: !18, file: !5, type: !20) !18 = distinct !DILexicalBlock(line: 6, column: 0, file: !1, scope: !19) !19 = distinct !DILexicalBlock(line: 6, column: 0, file: !1, scope: !14) !20 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) @@ -160,13 +160,13 @@ attributes #2 = { nounwind readnone } !22 = !{i32 2, !"Debug Info Version", i32 3} !23 = !{!"clang version 3.5.0 "} !24 = !{i1 false} -!25 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "b", line: 5, arg: 1, scope: !14, file: !5, type: !11) +!25 = !DILocalVariable(name: "b", line: 5, arg: 1, scope: !14, file: !5, type: !11) !26 = !DILocation(line: 14, scope: !4) !27 = !DILocation(line: 5, scope: !14, inlinedAt: !26) !28 = !DILocation(line: 10, scope: !14, inlinedAt: !26) !29 = !DILocation(line: 15, scope: !4) !30 = !DILocation(line: 17, scope: !8) -!31 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "b", line: 5, arg: 1, scope: !14, file: !5, type: !11) +!31 = !DILocalVariable(name: "b", line: 5, arg: 1, scope: !14, file: !5, type: !11) !32 = !DILocation(line: 18, scope: !8) !33 = !DILocation(line: 5, scope: !14, inlinedAt: !32) !34 = !DILocation(line: 6, scope: !19, inlinedAt: !32) @@ -175,7 +175,7 @@ attributes #2 = { nounwind readnone } !37 = !{!"int", !38, i64 0} !38 = !{!"omnipotent char", !39, i64 0} !39 = !{!"Simple C/C++ TBAA"} -!40 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "s", line: 7, scope: !18, file: !5, type: !20) +!40 = !DILocalVariable(name: "s", line: 7, scope: !18, file: !5, type: !20) !41 = !DILocation(line: 8, scope: !18, inlinedAt: !32) !42 = !DILocation(line: 9, scope: !18, inlinedAt: !32) !43 = !DILocation(line: 10, scope: !14, inlinedAt: !32) diff --git a/llvm/test/DebugInfo/namespace.ll b/llvm/test/DebugInfo/namespace.ll index 85ef7356205..f19b1d1f77d 100644 --- a/llvm/test/DebugInfo/namespace.ll +++ b/llvm/test/DebugInfo/namespace.ll @@ -349,12 +349,12 @@ attributes #1 = { nounwind readnone } !58 = !{i32 2, !"Debug Info Version", i32 3} !59 = !{!"clang version 3.6.0 "} !60 = !DILocation(line: 3, column: 12, scope: !10) -!61 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "", line: 4, arg: 1, scope: !14, file: !18, type: !13) +!61 = !DILocalVariable(name: "", line: 4, arg: 1, scope: !14, file: !18, type: !13) !62 = !DIExpression() !63 = !DILocation(line: 4, column: 12, scope: !14) !64 = !DILocation(line: 4, column: 16, scope: !14) !65 = !DILocation(line: 20, column: 12, scope: !17) -!66 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "b", line: 21, arg: 1, scope: !21, file: !18, type: !24) +!66 = !DILocalVariable(name: "b", line: 21, arg: 1, scope: !21, file: !18, type: !24) !67 = !DILocation(line: 21, column: 15, scope: !21) !68 = !DILocation(line: 22, column: 7, scope: !21) !69 = !DILocation(line: 24, column: 5, scope: !38) diff --git a/llvm/test/DebugInfo/namespace_inline_function_definition.ll b/llvm/test/DebugInfo/namespace_inline_function_definition.ll index c14152065b7..f08f544bd27 100644 --- a/llvm/test/DebugInfo/namespace_inline_function_definition.ll +++ b/llvm/test/DebugInfo/namespace_inline_function_definition.ll @@ -87,9 +87,9 @@ attributes #2 = { nounwind readnone } !14 = !{i32 2, !"Debug Info Version", i32 3} !15 = !{!"clang version 3.5.0 "} !16 = !DILocation(line: 5, scope: !4) -!17 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "i", line: 6, arg: 1, scope: !9, file: !5, type: !8) +!17 = !DILocalVariable(name: "i", line: 6, arg: 1, scope: !9, file: !5, type: !8) -!117 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "i", line: 6, arg: 1, scope: !9, file: !5, type: !8) +!117 = !DILocalVariable(name: "i", line: 6, arg: 1, scope: !9, file: !5, type: !8) !18 = !DILocation(line: 6, scope: !9, inlinedAt: !16) !19 = !DILocation(line: 6, scope: !9) diff --git a/llvm/test/DebugInfo/piece-verifier.ll b/llvm/test/DebugInfo/piece-verifier.ll index 9d7efd6a396..db453fbf961 100644 --- a/llvm/test/DebugInfo/piece-verifier.ll +++ b/llvm/test/DebugInfo/piece-verifier.ll @@ -39,13 +39,13 @@ attributes #1 = { nounwind readnone } !13 = !DIBasicType(tag: DW_TAG_base_type, name: "long int", size: 64, align: 64, encoding: DW_ATE_signed) !14 = !DIDerivedType(tag: DW_TAG_member, name: "b", line: 1, size: 32, align: 32, offset: 64, file: !1, scope: !10, baseType: !8) !15 = !{!16} -!16 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "s", line: 3, arg: 1, scope: !4, file: !5, type: !9) +!16 = !DILocalVariable(name: "s", line: 3, arg: 1, scope: !4, file: !5, type: !9) !17 = !{i32 2, !"Dwarf Version", i32 4} !18 = !{i32 1, !"Debug Info Version", i32 3} !19 = !{!"clang version 3.5 "} -!20 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "s", line: 3, arg: 1, scope: !4, file: !5, type: !9) +!20 = !DILocalVariable(name: "s", line: 3, arg: 1, scope: !4, file: !5, type: !9) !21 = !DILocation(line: 3, scope: !4) -!22 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "s", line: 3, arg: 1, scope: !4, file: !5, type: !9) +!22 = !DILocalVariable(name: "s", line: 3, arg: 1, scope: !4, file: !5, type: !9) !23 = !DILocation(line: 4, scope: !4) !24 = !DIExpression(DW_OP_deref, DW_OP_bit_piece, 0, 64) !25 = !{} diff --git a/llvm/test/DebugInfo/restrict.ll b/llvm/test/DebugInfo/restrict.ll index 71d94f60c96..330d31ab2d4 100644 --- a/llvm/test/DebugInfo/restrict.ll +++ b/llvm/test/DebugInfo/restrict.ll @@ -48,6 +48,6 @@ attributes #1 = { nounwind readnone } !10 = !{i32 2, !"Dwarf Version", i32 4} !11 = !{i32 1, !"Debug Info Version", i32 3} !12 = !{!"clang version 3.5.0 "} -!13 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "dst", line: 1, arg: 1, scope: !4, file: !5, type: !8) +!13 = !DILocalVariable(name: "dst", line: 1, arg: 1, scope: !4, file: !5, type: !8) !14 = !DILocation(line: 1, scope: !4) !15 = !DILocation(line: 2, scope: !4) diff --git a/llvm/test/DebugInfo/sugared-constants.ll b/llvm/test/DebugInfo/sugared-constants.ll index 421fe1dcd85..a74b8d9ff60 100644 --- a/llvm/test/DebugInfo/sugared-constants.ll +++ b/llvm/test/DebugInfo/sugared-constants.ll @@ -60,12 +60,12 @@ attributes #2 = { nounwind readnone } !7 = !{!8} !8 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) !9 = !{!10, !12, !15} -!10 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "i", line: 5, scope: !4, file: !5, type: !11) +!10 = !DILocalVariable(name: "i", line: 5, scope: !4, file: !5, type: !11) !11 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !8) -!12 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "j", line: 7, scope: !4, file: !5, type: !13) +!12 = !DILocalVariable(name: "j", line: 7, scope: !4, file: !5, type: !13) !13 = !DIDerivedType(tag: DW_TAG_const_type, baseType: !14) !14 = !DIBasicType(tag: DW_TAG_base_type, name: "unsigned int", size: 32, align: 32, encoding: DW_ATE_unsigned) -!15 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "c", line: 9, scope: !4, file: !5, type: !16) +!15 = !DILocalVariable(name: "c", line: 9, scope: !4, file: !5, type: !16) !16 = !DIBasicType(tag: DW_TAG_base_type, name: "char16_t", size: 16, align: 16, encoding: 16) !17 = !{i32 2, !"Dwarf Version", i32 4} !18 = !{i32 1, !"Debug Info Version", i32 3} diff --git a/llvm/test/DebugInfo/tu-composite.ll b/llvm/test/DebugInfo/tu-composite.ll index 47fb8bc3148..0fad5a16ccc 100644 --- a/llvm/test/DebugInfo/tu-composite.ll +++ b/llvm/test/DebugInfo/tu-composite.ll @@ -158,27 +158,27 @@ attributes #1 = { nounwind readnone } !33 = !DISubroutineType(types: !34) !34 = !{null} !35 = !{i32 2, !"Dwarf Version", i32 2} -!36 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "this", arg: 1, flags: DIFlagArtificial | DIFlagObjectPointer, scope: !31, type: !37) +!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: !"_ZTS1C") !38 = !DILocation(line: 0, scope: !31) !39 = !DILocation(line: 5, scope: !31) -!40 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "B", line: 21, scope: !32, file: !7, type: !41) +!40 = !DILocalVariable(name: "B", line: 21, scope: !32, file: !7, type: !41) !41 = !DIDerivedType(tag: DW_TAG_typedef, name: "baz", line: 8, file: !1, baseType: !"_ZTS3bar") !42 = !DILocation(line: 21, scope: !32) -!43 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "A", line: 22, scope: !32, file: !7, type: !44) +!43 = !DILocalVariable(name: "A", line: 22, scope: !32, file: !7, type: !44) !44 = !DICompositeType(tag: DW_TAG_array_type, size: 24, align: 8, baseType: !"_ZTS3bar", elements: !45) !45 = !{!46} !46 = !DISubrange(count: 3) !47 = !DILocation(line: 22, scope: !32) -!48 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "B2", line: 23, scope: !32, file: !7, type: !49) +!48 = !DILocalVariable(name: "B2", line: 23, scope: !32, file: !7, type: !49) !49 = !DIDerivedType(tag: DW_TAG_typedef, name: "baz2", line: 10, file: !1, scope: !"_ZTS1D", baseType: !"_ZTS3bar") !50 = !DILocation(line: 23, scope: !32) -!51 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "e", line: 24, scope: !32, file: !7, type: !22) +!51 = !DILocalVariable(name: "e", line: 24, scope: !32, file: !7, type: !22) !52 = !DILocation(line: 24, scope: !32) -!53 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "p", line: 25, scope: !32, file: !7, type: !54) +!53 = !DILocalVariable(name: "p", line: 25, scope: !32, file: !7, type: !54) !54 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !"_ZTSN1D7Nested2E") !55 = !DILocation(line: 25, scope: !32) -!56 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "t", line: 26, scope: !32, file: !7, type: !24) +!56 = !DILocalVariable(name: "t", line: 26, scope: !32, file: !7, type: !24) !57 = !DILocation(line: 26, scope: !32) !58 = !DILocation(line: 27, scope: !32) !59 = !{i32 1, !"Debug Info Version", i32 3} diff --git a/llvm/test/DebugInfo/two-cus-from-same-file.ll b/llvm/test/DebugInfo/two-cus-from-same-file.ll index 9dbd64a3fb9..00011c2c12d 100644 --- a/llvm/test/DebugInfo/two-cus-from-same-file.ll +++ b/llvm/test/DebugInfo/two-cus-from-same-file.ll @@ -52,8 +52,8 @@ declare void @llvm.dbg.value(metadata, i64, metadata, metadata) nounwind readnon !17 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 32, align: 32, baseType: !18) !18 = !DIBasicType(tag: DW_TAG_base_type, name: "char", size: 8, align: 8, encoding: DW_ATE_signed_char) !19 = !{!21, !22} -!21 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "argc", line: 11, arg: 1, scope: !12, file: !6, type: !15) -!22 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "argv", line: 11, arg: 2, scope: !12, file: !6, type: !16) +!21 = !DILocalVariable(name: "argc", line: 11, arg: 1, scope: !12, file: !6, type: !15) +!22 = !DILocalVariable(name: "argv", line: 11, arg: 2, scope: !12, file: !6, type: !16) !23 = !DILocation(line: 6, column: 3, scope: !24) !24 = distinct !DILexicalBlock(line: 5, column: 16, file: !32, scope: !5) !25 = !DILocation(line: 7, column: 1, scope: !24) diff --git a/llvm/test/DebugInfo/unconditional-branch.ll b/llvm/test/DebugInfo/unconditional-branch.ll index 220a0e3dbe3..ea04b08bdeb 100644 --- a/llvm/test/DebugInfo/unconditional-branch.ll +++ b/llvm/test/DebugInfo/unconditional-branch.ll @@ -57,7 +57,7 @@ attributes #1 = { nounwind readnone } !9 = !{i32 2, !"Dwarf Version", i32 4} !10 = !{i32 1, !"Debug Info Version", i32 3} !11 = !{!"clang version 3.5.0 (204712)"} -!12 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "i", line: 1, arg: 1, scope: !4, file: !5, type: !8) +!12 = !DILocalVariable(name: "i", line: 1, arg: 1, scope: !4, file: !5, type: !8) !13 = !DILocation(line: 1, scope: !4) !14 = !DILocation(line: 2, scope: !4) !15 = !DILocation(line: 4, scope: !16) diff --git a/llvm/test/DebugInfo/varargs.ll b/llvm/test/DebugInfo/varargs.ll index 93dbfa1e0ac..5d0028a2569 100644 --- a/llvm/test/DebugInfo/varargs.ll +++ b/llvm/test/DebugInfo/varargs.ll @@ -91,11 +91,11 @@ attributes #1 = { nounwind readnone } !18 = !{i32 2, !"Dwarf Version", i32 2} !19 = !{i32 1, !"Debug Info Version", i32 3} !20 = !{!"clang version 3.5 "} -!21 = !DILocalVariable(tag: DW_TAG_arg_variable, name: "c", line: 13, arg: 1, scope: !14, file: !15, type: !10) +!21 = !DILocalVariable(name: "c", line: 13, arg: 1, scope: !14, file: !15, type: !10) !22 = !DILocation(line: 13, scope: !14) -!23 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "a", line: 16, scope: !14, file: !15, type: !4) +!23 = !DILocalVariable(name: "a", line: 16, scope: !14, file: !15, type: !4) !24 = !DILocation(line: 16, scope: !14) -!25 = !DILocalVariable(tag: DW_TAG_auto_variable, name: "fptr", line: 18, scope: !14, file: !15, type: !26) +!25 = !DILocalVariable(name: "fptr", line: 18, scope: !14, file: !15, type: !26) !26 = !DIDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, baseType: !16) !27 = !DILocation(line: 18, scope: !14) !28 = !DILocation(line: 22, scope: !14) |
