From 2c3e0051c31c3f5b2328b447eadf1cf9c4427442 Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Wed, 6 May 2015 11:46:36 -0700 Subject: Update aosp/master LLVM for rebase to r235153 Change-Id: I9bf53792f9fc30570e81a8d80d296c681d005ea7 (cherry picked from commit 0c7f116bb6950ef819323d855415b2f2b0aad987) --- test/Linker/2011-08-04-DebugLoc.ll | 2 +- test/Linker/2011-08-04-DebugLoc2.ll | 2 +- test/Linker/2011-08-04-Metadata.ll | 2 +- test/Linker/2011-08-04-Metadata2.ll | 2 +- test/Linker/2011-08-18-unique-class-type.ll | 2 +- test/Linker/2011-08-18-unique-class-type2.ll | 2 +- test/Linker/2011-08-18-unique-debug-type.ll | 2 +- test/Linker/2011-08-18-unique-debug-type2.ll | 2 +- test/Linker/DbgDeclare.ll | 5 ++--- test/Linker/DbgDeclare2.ll | 5 ++--- test/Linker/Inputs/basiclink.b.ll | 2 +- test/Linker/Inputs/drop-debug.bc | Bin 0 -> 1152 bytes test/Linker/Inputs/type-unique-inheritance-a.ll | 2 +- test/Linker/Inputs/type-unique-inheritance-b.ll | 2 +- test/Linker/broken.ll | 2 +- test/Linker/drop-debug.ll | 6 ++++++ test/Linker/subprogram-linkonce-weak-odr.ll | 10 +++++----- test/Linker/subprogram-linkonce-weak.ll | 12 ++++++------ test/Linker/type-unique-odr-a.ll | 3 +-- test/Linker/type-unique-odr-b.ll | 3 +-- test/Linker/type-unique-simple2-a.ll | 9 +++------ test/Linker/type-unique-simple2-b.ll | 6 ++---- 22 files changed, 40 insertions(+), 43 deletions(-) create mode 100644 test/Linker/Inputs/drop-debug.bc create mode 100644 test/Linker/drop-debug.ll (limited to 'test/Linker') diff --git a/test/Linker/2011-08-04-DebugLoc.ll b/test/Linker/2011-08-04-DebugLoc.ll index 18fa7da..25d08cd 100644 --- a/test/Linker/2011-08-04-DebugLoc.ll +++ b/test/Linker/2011-08-04-DebugLoc.ll @@ -26,6 +26,6 @@ define i32 @foo() nounwind ssp { !6 = !MDLocation(line: 2, column: 13, scope: !7) !7 = distinct !MDLexicalBlock(line: 2, column: 11, file: !8, scope: !1) !8 = !MDFile(filename: "a.c", directory: "/private/tmp") -!9 = !{i32 0} +!9 = !{} !10 = !{!1} !11 = !{i32 1, !"Debug Info Version", i32 3} diff --git a/test/Linker/2011-08-04-DebugLoc2.ll b/test/Linker/2011-08-04-DebugLoc2.ll index 93eb61d..76e73dd 100644 --- a/test/Linker/2011-08-04-DebugLoc2.ll +++ b/test/Linker/2011-08-04-DebugLoc2.ll @@ -23,6 +23,6 @@ define i32 @bar() nounwind ssp { !6 = !MDLocation(line: 1, column: 13, scope: !7) !7 = distinct !MDLexicalBlock(line: 1, column: 11, file: !8, scope: !1) !8 = !MDFile(filename: "b.c", directory: "/private/tmp") -!9 = !{i32 0} +!9 = !{} !10 = !{!1} !11 = !{i32 1, !"Debug Info Version", i32 3} diff --git a/test/Linker/2011-08-04-Metadata.ll b/test/Linker/2011-08-04-Metadata.ll index 2a1711a..7b39800 100644 --- a/test/Linker/2011-08-04-Metadata.ll +++ b/test/Linker/2011-08-04-Metadata.ll @@ -24,7 +24,7 @@ entry: !llvm.dbg.sp = !{!1} !llvm.dbg.gv = !{!5} -!0 = !MDCompileUnit(language: DW_LANG_C99, producer: "clang version 3.0 ()", isOptimized: true, emissionKind: 0, file: !9, enums: !4, retainedTypes: !4, subprograms: !10) +!0 = !MDCompileUnit(language: DW_LANG_C99, producer: "clang version 3.0 ()", isOptimized: true, emissionKind: 0, file: !9, enums: !{}, retainedTypes: !{}, subprograms: !10) !1 = !MDSubprogram(name: "foo", line: 3, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, file: !9, scope: !2, type: !3, function: void ()* @foo) !2 = !MDFile(filename: "/tmp/one.c", directory: "/Volumes/Lalgate/Slate/D") !3 = !MDSubroutineType(types: !4) diff --git a/test/Linker/2011-08-04-Metadata2.ll b/test/Linker/2011-08-04-Metadata2.ll index e62c122..ba8c6db 100644 --- a/test/Linker/2011-08-04-Metadata2.ll +++ b/test/Linker/2011-08-04-Metadata2.ll @@ -19,7 +19,7 @@ entry: !llvm.dbg.sp = !{!1} !llvm.dbg.gv = !{!5} -!0 = !MDCompileUnit(language: DW_LANG_C99, producer: "clang version 3.0 ()", isOptimized: true, emissionKind: 0, file: !9, enums: !4, retainedTypes: !4, subprograms: !10) +!0 = !MDCompileUnit(language: DW_LANG_C99, producer: "clang version 3.0 ()", isOptimized: true, emissionKind: 0, file: !9, enums: !{}, retainedTypes: !{}, subprograms: !10) !1 = !MDSubprogram(name: "bar", line: 2, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, file: !9, scope: !2, type: !3, function: void ()* @bar) !2 = !MDFile(filename: "/tmp/two.c", directory: "/Volumes/Lalgate/Slate/D") !3 = !MDSubroutineType(types: !4) diff --git a/test/Linker/2011-08-18-unique-class-type.ll b/test/Linker/2011-08-18-unique-class-type.ll index 4ffb249..ee62e40 100644 --- a/test/Linker/2011-08-18-unique-class-type.ll +++ b/test/Linker/2011-08-18-unique-class-type.ll @@ -22,7 +22,7 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !0 = !MDCompileUnit(language: DW_LANG_C_plus_plus, producer: "clang version 3.0 (trunk 137954)", isOptimized: true, emissionKind: 0, file: !16, enums: !2, retainedTypes: !2, subprograms: !3, globals: !2) !1 = !{!2} -!2 = !{i32 0} +!2 = !{} !3 = !{!5} !5 = !MDSubprogram(name: "foo", linkageName: "_Z3fooN2N11AE", line: 4, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, file: !16, scope: !6, type: !7, function: void ()* @_Z3fooN2N11AE) !6 = !MDFile(filename: "n1.c", directory: "/private/tmp") diff --git a/test/Linker/2011-08-18-unique-class-type2.ll b/test/Linker/2011-08-18-unique-class-type2.ll index da75160..a603aee 100644 --- a/test/Linker/2011-08-18-unique-class-type2.ll +++ b/test/Linker/2011-08-18-unique-class-type2.ll @@ -20,7 +20,7 @@ declare void @llvm.dbg.declare(metadata, metadata, metadata) nounwind readnone !0 = !MDCompileUnit(language: DW_LANG_C_plus_plus, producer: "clang version 3.0 (trunk 137954)", isOptimized: true, emissionKind: 0, file: !16, enums: !2, retainedTypes: !2, subprograms: !3, globals: !2) !1 = !{!2} -!2 = !{i32 0} +!2 = !{} !3 = !{!5} !5 = !MDSubprogram(name: "bar", linkageName: "_Z3barN2N11AE", line: 4, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scope: !6, type: !7, function: void ()* @_Z3barN2N11AE) !6 = !MDFile(filename: "n2.c", directory: "/private/tmp") diff --git a/test/Linker/2011-08-18-unique-debug-type.ll b/test/Linker/2011-08-18-unique-debug-type.ll index 7184d52..a8ccd27 100644 --- a/test/Linker/2011-08-18-unique-debug-type.ll +++ b/test/Linker/2011-08-18-unique-debug-type.ll @@ -14,7 +14,7 @@ entry: !0 = !MDCompileUnit(language: DW_LANG_C99, producer: "clang version 3.0 (trunk 137954)", isOptimized: true, emissionKind: 0, file: !12, enums: !2, retainedTypes: !2, subprograms: !3, globals: !2) !1 = !{!2} -!2 = !{i32 0} +!2 = !{} !3 = !{!5} !5 = !MDSubprogram(name: "foo", line: 1, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, file: !12, scope: !6, type: !7, function: i32 ()* @foo) !6 = !MDFile(filename: "one.c", directory: "/private/tmp") diff --git a/test/Linker/2011-08-18-unique-debug-type2.ll b/test/Linker/2011-08-18-unique-debug-type2.ll index 2b04560..242f953 100644 --- a/test/Linker/2011-08-18-unique-debug-type2.ll +++ b/test/Linker/2011-08-18-unique-debug-type2.ll @@ -14,7 +14,7 @@ entry: !0 = !MDCompileUnit(language: DW_LANG_C99, producer: "clang version 3.0 (trunk 137954)", isOptimized: true, emissionKind: 0, file: !12, enums: !2, retainedTypes: !2, subprograms: !3, globals: !2) !1 = !{!2} -!2 = !{i32 0} +!2 = !{} !3 = !{!5} !5 = !MDSubprogram(name: "bar", line: 1, isLocal: false, isDefinition: true, virtualIndex: 6, isOptimized: false, file: !12, scope: !6, type: !7, function: i32 ()* @bar) !6 = !MDFile(filename: "two.c", directory: "/private/tmp") diff --git a/test/Linker/DbgDeclare.ll b/test/Linker/DbgDeclare.ll index 9afb8fb..6a9239f 100644 --- a/test/Linker/DbgDeclare.ll +++ b/test/Linker/DbgDeclare.ll @@ -38,10 +38,9 @@ declare void @test(i32, i8**) !llvm.module.flags = !{!21} !0 = !MDCompileUnit(language: DW_LANG_C_plus_plus, producer: "clang version 3.3 (trunk 173515)", isOptimized: true, emissionKind: 0, file: !20, enums: !2, retainedTypes: !2, subprograms: !3, globals: !2) -!1 = !{!2} -!2 = !{i32 0} +!2 = !{} !3 = !{!5} -!5 = !MDSubprogram(name: "main", line: 3, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 4, file: !20, scope: null, type: !7, function: i32 (i32, i8**)* @main, variables: !1) +!5 = !MDSubprogram(name: "main", line: 3, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 4, file: !20, scope: null, type: !7, function: i32 (i32, i8**)* @main, variables: !2) !6 = !MDFile(filename: "main.cpp", directory: "/private/tmp") !7 = !MDSubroutineType(types: !8) !8 = !{!9, !9, !10} diff --git a/test/Linker/DbgDeclare2.ll b/test/Linker/DbgDeclare2.ll index 107d8c1..2afe0c2 100644 --- a/test/Linker/DbgDeclare2.ll +++ b/test/Linker/DbgDeclare2.ll @@ -51,10 +51,9 @@ declare i32 @puts(i8*) !llvm.module.flags = !{!27} !0 = !MDCompileUnit(language: DW_LANG_C_plus_plus, producer: "clang version 3.3 (trunk 173515)", isOptimized: true, emissionKind: 0, file: !25, enums: !2, retainedTypes: !2, subprograms: !3, globals: !2) -!1 = !{!2} -!2 = !{i32 0} +!2 = !{} !3 = !{!5} -!5 = !MDSubprogram(name: "print_args", linkageName: "test", line: 4, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 5, file: !26, scope: null, type: !7, function: void (i32, i8**)* @test, variables: !1) +!5 = !MDSubprogram(name: "print_args", linkageName: "test", line: 4, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 5, file: !26, scope: null, type: !7, function: void (i32, i8**)* @test, variables: !2) !6 = !MDFile(filename: "test.cpp", directory: "/private/tmp") !7 = !MDSubroutineType(types: !8) !8 = !{null, !9, !10} diff --git a/test/Linker/Inputs/basiclink.b.ll b/test/Linker/Inputs/basiclink.b.ll index 0d2abc7..407aa94 100644 --- a/test/Linker/Inputs/basiclink.b.ll +++ b/test/Linker/Inputs/basiclink.b.ll @@ -1,6 +1,6 @@ declare i32* @foo(...) define i32* @bar() { - %ret = call i32* (...)* @foo( i32 123 ) + %ret = call i32* (...) @foo( i32 123 ) ret i32* %ret } @baz = global i32 0 diff --git a/test/Linker/Inputs/drop-debug.bc b/test/Linker/Inputs/drop-debug.bc new file mode 100644 index 0000000..f9c471f Binary files /dev/null and b/test/Linker/Inputs/drop-debug.bc differ diff --git a/test/Linker/Inputs/type-unique-inheritance-a.ll b/test/Linker/Inputs/type-unique-inheritance-a.ll index 2159f98..82f9d55 100644 --- a/test/Linker/Inputs/type-unique-inheritance-a.ll +++ b/test/Linker/Inputs/type-unique-inheritance-a.ll @@ -68,7 +68,7 @@ attributes #1 = { nounwind readnone } !0 = !MDCompileUnit(language: DW_LANG_C_plus_plus, producer: "clang version 3.4 (http://llvm.org/git/clang.git f54e02f969d02d640103db73efc30c45439fceab) (http://llvm.org/git/llvm.git 284353b55896cb1babfaa7add7c0a363245342d2)", isOptimized: false, emissionKind: 0, file: !1, enums: !2, retainedTypes: !3, subprograms: !14, globals: !2, imports: !2) !1 = !MDFile(filename: "foo.cpp", directory: "/Users/mren/c_testing/type_unique_air/inher") -!2 = !{i32 0} +!2 = !{} !3 = !{!4, !8} !4 = !MDCompositeType(tag: DW_TAG_class_type, name: "A", line: 3, size: 64, align: 32, file: !5, elements: !6, identifier: "_ZTS1A") !5 = !MDFile(filename: "./a.hpp", directory: "/Users/mren/c_testing/type_unique_air/inher") diff --git a/test/Linker/Inputs/type-unique-inheritance-b.ll b/test/Linker/Inputs/type-unique-inheritance-b.ll index f16ae1a..2a27d7c 100644 --- a/test/Linker/Inputs/type-unique-inheritance-b.ll +++ b/test/Linker/Inputs/type-unique-inheritance-b.ll @@ -42,7 +42,7 @@ attributes #3 = { "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "n !0 = !MDCompileUnit(language: DW_LANG_C_plus_plus, producer: "clang version 3.4 (http://llvm.org/git/clang.git f54e02f969d02d640103db73efc30c45439fceab) (http://llvm.org/git/llvm.git 284353b55896cb1babfaa7add7c0a363245342d2)", isOptimized: false, emissionKind: 0, file: !1, enums: !2, retainedTypes: !3, subprograms: !19, globals: !2, imports: !2) !1 = !MDFile(filename: "bar.cpp", directory: "/Users/mren/c_testing/type_unique_air/inher") -!2 = !{i32 0} +!2 = !{} !3 = !{!4, !11, !15} !4 = !MDCompositeType(tag: DW_TAG_class_type, name: "B", line: 7, size: 128, align: 64, file: !5, elements: !6, identifier: "_ZTS1B") !5 = !MDFile(filename: "./b.hpp", directory: "/Users/mren/c_testing/type_unique_air/inher") diff --git a/test/Linker/broken.ll b/test/Linker/broken.ll index 2276401..8aefe4e 100644 --- a/test/Linker/broken.ll +++ b/test/Linker/broken.ll @@ -1,6 +1,6 @@ ; RUN: not llvm-link -o /dev/null %s 2>&1 | FileCheck %s -; CHECK: input module '{{.*}}broken.ll' is broken +; CHECK: broken.ll: error: input module is broken! define i32 @foo(i32 %v) { %first = add i32 %v, %second %second = add i32 %v, 3 diff --git a/test/Linker/drop-debug.ll b/test/Linker/drop-debug.ll new file mode 100644 index 0000000..9c1072a --- /dev/null +++ b/test/Linker/drop-debug.ll @@ -0,0 +1,6 @@ +; RUN: llvm-link %p/Inputs/drop-debug.bc -o %t 2>&1 | FileCheck %s + +;; drop-debug.bc was created from "void f(void) {}" with clang 3.5 and +; -gline-tables-only, so it contains old debug info. + +; CHECK: warning: ignoring debug info with an invalid version (1) in {{.*}}/Inputs/drop-debug.bc diff --git a/test/Linker/subprogram-linkonce-weak-odr.ll b/test/Linker/subprogram-linkonce-weak-odr.ll index 97058fd..52ce679 100644 --- a/test/Linker/subprogram-linkonce-weak-odr.ll +++ b/test/Linker/subprogram-linkonce-weak-odr.ll @@ -113,13 +113,13 @@ entry: ; DWLW-NOT: DW_AT_low_pc ; DWLW-NOT: DW_AT_high_pc ; DWLW: DW_AT_name {{.*}}foo -; DWLW: DW_AT_decl_file {{.*}}"/path/to/dir/foo.h" +; DWLW: DW_AT_decl_file {{.*}}"/path/to/dir{{/|\\}}foo.h" ; DWLW: DW_AT_decl_line {{.*}}(1) ; DWLW: DW_TAG_subprogram ; DWLW: DW_AT_low_pc ; DWLW: DW_AT_high_pc ; DWLW: DW_AT_name {{.*}}bar -; DWLW: DW_AT_decl_file {{.*}}"/path/to/dir/bar.c" +; DWLW: DW_AT_decl_file {{.*}}"/path/to/dir{{/|\\}}bar.c" ; DWLW: DW_AT_decl_line {{.*}}(11) ; DWLW: DW_TAG_inlined_subroutine ; DWLW: DW_AT_abstract_origin @@ -129,7 +129,7 @@ entry: ; DWLW: DW_AT_low_pc ; DWLW: DW_AT_high_pc ; DWLW: DW_AT_name {{.*}}foo -; DWLW: DW_AT_decl_file {{.*}}"/path/to/dir/foo.h" +; DWLW: DW_AT_decl_file {{.*}}"/path/to/dir{{/|\\}}foo.h" ; DWLW: DW_AT_decl_line {{.*}}(1) ; The DWARF output is already symmetric (just reordered). @@ -139,7 +139,7 @@ entry: ; DWWL: DW_AT_low_pc ; DWWL: DW_AT_high_pc ; DWWL: DW_AT_name {{.*}}foo -; DWWL: DW_AT_decl_file {{.*}}"/path/to/dir/foo.h" +; DWWL: DW_AT_decl_file {{.*}}"/path/to/dir{{/|\\}}foo.h" ; DWWL: DW_AT_decl_line {{.*}}(1) ; DWWL: DW_TAG_compile_unit ; DWWL: DW_AT_name {{.*}}"bar.c" @@ -154,7 +154,7 @@ entry: ; DWWL: DW_AT_high_pc ; DWWL-NOT: DW_AT_name {{.*}}foo ; DWWL: DW_AT_name {{.*}}bar -; DWWL: DW_AT_decl_file {{.*}}"/path/to/dir/bar.c" +; DWWL: DW_AT_decl_file {{.*}}"/path/to/dir{{/|\\}}bar.c" ; DWWL: DW_AT_decl_line {{.*}}(11) ; DWWL: DW_TAG_inlined_subroutine ; DWWL: DW_AT_abstract_origin diff --git a/test/Linker/subprogram-linkonce-weak.ll b/test/Linker/subprogram-linkonce-weak.ll index 42a8b39..94d4365 100644 --- a/test/Linker/subprogram-linkonce-weak.ll +++ b/test/Linker/subprogram-linkonce-weak.ll @@ -109,13 +109,13 @@ entry: ; DWLW-NOT: DW_AT_low_pc ; DWLW-NOT: DW_AT_high_pc ; DWLW: DW_AT_name {{.*}}foo -; DWLW: DW_AT_decl_file {{.*}}"/path/to/dir/bar.c" +; DWLW: DW_AT_decl_file {{.*}}"/path/to/dir{{/|\\}}bar.c" ; DWLW: DW_AT_decl_line {{.*}}(1) ; DWLW: DW_TAG_subprogram ; DWLW: DW_AT_low_pc ; DWLW: DW_AT_high_pc ; DWLW: DW_AT_name {{.*}}bar -; DWLW: DW_AT_decl_file {{.*}}"/path/to/dir/bar.c" +; DWLW: DW_AT_decl_file {{.*}}"/path/to/dir{{/|\\}}bar.c" ; DWLW: DW_AT_decl_line {{.*}}(11) ; DWLW: DW_TAG_inlined_subroutine @@ -126,7 +126,7 @@ entry: ; DWLW: DW_AT_low_pc ; DWLW: DW_AT_high_pc ; DWLW: DW_AT_name {{.*}}foo -; DWLW: DW_AT_decl_file {{.*}}"/path/to/dir/foo.c" +; DWLW: DW_AT_decl_file {{.*}}"/path/to/dir{{/|\\}}foo.c" ; DWLW: DW_AT_decl_line {{.*}}(51) ; The DWARF output is already symmetric (just reordered). @@ -136,7 +136,7 @@ entry: ; DWWL: DW_AT_low_pc ; DWWL: DW_AT_high_pc ; DWWL: DW_AT_name {{.*}}foo -; DWWL: DW_AT_decl_file {{.*}}"/path/to/dir/foo.c" +; DWWL: DW_AT_decl_file {{.*}}"/path/to/dir{{/|\\}}foo.c" ; DWWL: DW_AT_decl_line {{.*}}(51) ; DWWL: DW_TAG_compile_unit ; DWWL: DW_AT_name {{.*}}"bar.c" @@ -144,13 +144,13 @@ entry: ; DWWL-NOT: DW_AT_low_pc ; DWWL-NOT: DW_AT_high_pc ; DWWL: DW_AT_name {{.*}}foo -; DWWL: DW_AT_decl_file {{.*}}"/path/to/dir/bar.c" +; DWWL: DW_AT_decl_file {{.*}}"/path/to/dir{{/|\\}}bar.c" ; DWWL: DW_AT_decl_line {{.*}}(1) ; DWWL: DW_TAG_subprogram ; DWWL: DW_AT_low_pc ; DWWL: DW_AT_high_pc ; DWWL: DW_AT_name {{.*}}bar -; DWWL: DW_AT_decl_file {{.*}}"/path/to/dir/bar.c" +; DWWL: DW_AT_decl_file {{.*}}"/path/to/dir{{/|\\}}bar.c" ; DWWL: DW_AT_decl_line {{.*}}(11) ; DWWL: DW_TAG_inlined_subroutine ; DWWL: DW_AT_abstract_origin diff --git a/test/Linker/type-unique-odr-a.ll b/test/Linker/type-unique-odr-a.ll index 2321c01..a446547 100644 --- a/test/Linker/type-unique-odr-a.ll +++ b/test/Linker/type-unique-odr-a.ll @@ -82,11 +82,10 @@ attributes #1 = { nounwind readnone } !6 = !{!7, !9} !7 = !MDDerivedType(tag: DW_TAG_member, name: "data", line: 2, size: 32, align: 32, flags: DIFlagPrivate, file: !5, scope: !"_ZTS1A", baseType: !8) !8 = !MDBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -!9 = !MDSubprogram(name: "getFoo", linkageName: "_ZN1A6getFooEv", line: 4, isLocal: false, isDefinition: false, virtualIndex: 6, flags: DIFlagProtected | DIFlagPrototyped, isOptimized: false, scopeLine: 4, file: !5, scope: !"_ZTS1A", type: !10, variables: !13) +!9 = !MDSubprogram(name: "getFoo", linkageName: "_ZN1A6getFooEv", line: 4, isLocal: false, isDefinition: false, virtualIndex: 6, flags: DIFlagProtected | DIFlagPrototyped, isOptimized: false, scopeLine: 4, file: !5, scope: !"_ZTS1A", type: !10) !10 = !MDSubroutineType(types: !11) !11 = !{null, !12} !12 = !MDDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, flags: DIFlagArtificial | DIFlagObjectPointer, baseType: !"_ZTS1A") -!13 = !{i32 786468} !14 = !{!15, !19} !15 = !MDSubprogram(name: "baz", linkageName: "_Z3bazv", line: 11, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 11, file: !5, scope: !16, type: !17, function: void ()* @_Z3bazv, variables: !2) !16 = !MDFile(filename: "type-unique-odr-a.cpp", directory: "") diff --git a/test/Linker/type-unique-odr-b.ll b/test/Linker/type-unique-odr-b.ll index 7123619..c7a48aa 100644 --- a/test/Linker/type-unique-odr-b.ll +++ b/test/Linker/type-unique-odr-b.ll @@ -63,11 +63,10 @@ attributes #1 = { nounwind readnone } !6 = !{!7, !9} !7 = !MDDerivedType(tag: DW_TAG_member, name: "data", line: 3, size: 32, align: 32, flags: DIFlagPrivate, file: !5, scope: !"_ZTS1A", baseType: !8) !8 = !MDBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -!9 = !MDSubprogram(name: "getFoo", linkageName: "_ZN1A6getFooEv", line: 5, isLocal: false, isDefinition: false, virtualIndex: 6, flags: DIFlagProtected | DIFlagPrototyped, isOptimized: false, scopeLine: 5, file: !5, scope: !"_ZTS1A", type: !10, variables: !13) +!9 = !MDSubprogram(name: "getFoo", linkageName: "_ZN1A6getFooEv", line: 5, isLocal: false, isDefinition: false, virtualIndex: 6, flags: DIFlagProtected | DIFlagPrototyped, isOptimized: false, scopeLine: 5, file: !5, scope: !"_ZTS1A", type: !10) !10 = !MDSubroutineType(types: !11) !11 = !{null, !12} !12 = !MDDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, flags: DIFlagArtificial | DIFlagObjectPointer, baseType: !"_ZTS1A") -!13 = !{i32 786468} !14 = !{!15, !16, !20} !15 = !MDSubprogram(name: "getFoo", linkageName: "_ZN1A6getFooEv", line: 8, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 8, file: !5, scope: !"_ZTS1A", type: !10, function: void (%class.A*)* @_ZN1A6getFooEv, declaration: !9, variables: !2) !16 = !MDSubprogram(name: "f", linkageName: "_Z1fv", line: 11, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 11, file: !5, scope: !17, type: !18, function: void ()* @_Z1fv, variables: !2) diff --git a/test/Linker/type-unique-simple2-a.ll b/test/Linker/type-unique-simple2-a.ll index ed53601..8a1cc20 100644 --- a/test/Linker/type-unique-simple2-a.ll +++ b/test/Linker/type-unique-simple2-a.ll @@ -94,26 +94,23 @@ attributes #4 = { nounwind readnone } !11 = !MDSubroutineType(types: !12) !12 = !{!13} !13 = !MDBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -!14 = !MDSubprogram(name: "setFoo", linkageName: "_ZN1A6setFooEv", line: 4, isLocal: false, isDefinition: false, virtuality: DW_VIRTUALITY_virtual, virtualIndex: 6, flags: DIFlagPublic | DIFlagPrototyped, isOptimized: false, scopeLine: 4, file: !5, scope: !"_ZTS1A", type: !15, containingType: !"_ZTS1A", variables: !18) +!14 = !MDSubprogram(name: "setFoo", linkageName: "_ZN1A6setFooEv", line: 4, isLocal: false, isDefinition: false, virtuality: DW_VIRTUALITY_virtual, virtualIndex: 6, flags: DIFlagPublic | DIFlagPrototyped, isOptimized: false, scopeLine: 4, file: !5, scope: !"_ZTS1A", type: !15, containingType: !"_ZTS1A") !15 = !MDSubroutineType(types: !16) !16 = !{null, !17} !17 = !MDDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, flags: DIFlagArtificial | DIFlagObjectPointer, baseType: !"_ZTS1A") -!18 = !{i32 786468} -!19 = !MDSubprogram(name: "getFoo", linkageName: "_ZN1A6getFooEv", line: 5, isLocal: false, isDefinition: false, virtuality: DW_VIRTUALITY_virtual, virtualIndex: 6, flags: DIFlagPublic | DIFlagPrototyped, isOptimized: false, scopeLine: 5, file: !5, scope: !"_ZTS1A", type: !20, containingType: !"_ZTS1A", variables: !25) +!19 = !MDSubprogram(name: "getFoo", linkageName: "_ZN1A6getFooEv", line: 5, isLocal: false, isDefinition: false, virtuality: DW_VIRTUALITY_virtual, virtualIndex: 6, flags: DIFlagPublic | DIFlagPrototyped, isOptimized: false, scopeLine: 5, file: !5, scope: !"_ZTS1A", type: !20, containingType: !"_ZTS1A") !20 = !MDSubroutineType(types: !21) !21 = !{!22, !17} !22 = !MDDerivedType(tag: DW_TAG_const_type, baseType: !23) !23 = !MDDerivedType(tag: DW_TAG_typedef, name: "foo_t", line: 1, file: !24, baseType: !13) !24 = !MDFile(filename: "a.cpp", directory: "") -!25 = !{i32 786468} !26 = !{!27, !31, !34} !27 = !MDSubprogram(name: "bar", linkageName: "_Z3barv", line: 2, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, scopeLine: 2, file: !24, scope: !28, type: !29, function: i32 ()* @_Z3barv, variables: !2) !28 = !MDFile(filename: "a.cpp", directory: "") !29 = !MDSubroutineType(types: !30) !30 = !{!23} !31 = !MDSubprogram(name: "A", linkageName: "_ZN1AC1Ev", line: 2, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagArtificial | DIFlagPrototyped, isOptimized: false, scopeLine: 2, file: !5, scope: !"_ZTS1A", type: !15, function: void (%class.A*)* @_ZN1AC1Ev, declaration: !32, variables: !2) -!32 = !MDSubprogram(name: "A", isLocal: false, isDefinition: false, virtualIndex: 6, flags: DIFlagArtificial | DIFlagPrototyped, isOptimized: false, scope: !"_ZTS1A", type: !15, variables: !33) -!33 = !{i32 786468} +!32 = !MDSubprogram(name: "A", isLocal: false, isDefinition: false, virtualIndex: 6, flags: DIFlagArtificial | DIFlagPrototyped, isOptimized: false, scope: !"_ZTS1A", type: !15) !34 = !MDSubprogram(name: "A", linkageName: "_ZN1AC2Ev", line: 2, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagArtificial | DIFlagPrototyped, isOptimized: false, scopeLine: 2, file: !5, scope: !"_ZTS1A", type: !15, function: void (%class.A*)* @_ZN1AC2Ev, declaration: !32, variables: !2) !35 = !{i32 2, !"Dwarf Version", i32 2} !36 = !{i32 1, !"Debug Info Version", i32 3} diff --git a/test/Linker/type-unique-simple2-b.ll b/test/Linker/type-unique-simple2-b.ll index 884995b..1679405 100644 --- a/test/Linker/type-unique-simple2-b.ll +++ b/test/Linker/type-unique-simple2-b.ll @@ -61,17 +61,15 @@ attributes #1 = { nounwind readnone } !11 = !MDSubroutineType(types: !12) !12 = !{!13} !13 = !MDBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -!14 = !MDSubprogram(name: "setFoo", linkageName: "_ZN1A6setFooEv", line: 4, isLocal: false, isDefinition: false, virtuality: DW_VIRTUALITY_virtual, virtualIndex: 6, flags: DIFlagPublic | DIFlagPrototyped, isOptimized: false, scopeLine: 4, file: !5, scope: !"_ZTS1A", type: !15, containingType: !"_ZTS1A", variables: !18) +!14 = !MDSubprogram(name: "setFoo", linkageName: "_ZN1A6setFooEv", line: 4, isLocal: false, isDefinition: false, virtuality: DW_VIRTUALITY_virtual, virtualIndex: 6, flags: DIFlagPublic | DIFlagPrototyped, isOptimized: false, scopeLine: 4, file: !5, scope: !"_ZTS1A", type: !15, containingType: !"_ZTS1A") !15 = !MDSubroutineType(types: !16) !16 = !{null, !17} !17 = !MDDerivedType(tag: DW_TAG_pointer_type, size: 64, align: 64, flags: DIFlagArtificial | DIFlagObjectPointer, baseType: !"_ZTS1A") -!18 = !{i32 786468} -!19 = !MDSubprogram(name: "getFoo", linkageName: "_ZN1A6getFooEv", line: 5, isLocal: false, isDefinition: false, virtuality: DW_VIRTUALITY_virtual, virtualIndex: 6, flags: DIFlagPublic | DIFlagPrototyped, isOptimized: false, scopeLine: 5, file: !5, scope: !"_ZTS1A", type: !20, containingType: !"_ZTS1A", variables: !24) +!19 = !MDSubprogram(name: "getFoo", linkageName: "_ZN1A6getFooEv", line: 5, isLocal: false, isDefinition: false, virtuality: DW_VIRTUALITY_virtual, virtualIndex: 6, flags: DIFlagPublic | DIFlagPrototyped, isOptimized: false, scopeLine: 5, file: !5, scope: !"_ZTS1A", type: !20, containingType: !"_ZTS1A") !20 = !MDSubroutineType(types: !21) !21 = !{!22, !17} !22 = !MDDerivedType(tag: DW_TAG_const_type, baseType: !23) !23 = !MDDerivedType(tag: DW_TAG_typedef, name: "foo_t", line: 1, file: !5, baseType: !13) -!24 = !{i32 786468} !25 = !{!26, !28} !26 = !MDSubprogram(name: "setFoo", linkageName: "_ZN1A6setFooEv", line: 2, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPublic | DIFlagPrototyped, isOptimized: false, scopeLine: 2, file: !27, scope: !"_ZTS1A", type: !15, function: void (%class.A*)* @_ZN1A6setFooEv, declaration: !14, variables: !2) !27 = !MDFile(filename: "b.cpp", directory: "") -- cgit v1.1