Debug Info: In DIBuilder, the context field of a forward decl is updated

to use DIScopeRef.

llvm-svn: 192309

diff --git a/llvm/lib/IR/DIBuilder.cpp b/llvm/lib/IR/DIBuilder.cpp
index 1b6c5d3..70fa881 100644 (file)
--- a/llvm/lib/IR/DIBuilder.cpp
+++ b/llvm/lib/IR/DIBuilder.cpp
@@ -878,7 +878,7 @@ DICompositeType DIBuilder::createForwardDecl(unsigned Tag, StringRef Name,
   Value *Elts[] = {
     GetTagConstant(VMContext, Tag),
     F.getFileNode(),
-    getNonCompileUnitScope(Scope),
+    DIScope(getNonCompileUnitScope(Scope)).getRef(),
     MDString::get(VMContext, Name),
     ConstantInt::get(Type::getInt32Ty(VMContext), Line),
     ConstantInt::get(Type::getInt64Ty(VMContext), SizeInBits),

diff --git a/llvm/test/DebugInfo/tu-composite.ll b/llvm/test/DebugInfo/tu-composite.ll
index 1100fb9..4943fe1 100644 (file)
--- a/llvm/test/DebugInfo/tu-composite.ll
+++ b/llvm/test/DebugInfo/tu-composite.ll
@@ -13,6 +13,9 @@
 ; CHECK: DW_AT_name [DW_FORM_strp] {{.*}}= "a") 
 ; CHECK: DW_TAG_structure_type
 ; CHECK-NEXT: DW_AT_name [DW_FORM_strp] {{.*}}= "Nested")
+; CHECK: DW_TAG_structure_type
+; CHECK-NEXT: DW_AT_name [DW_FORM_strp] {{.*}}= "Nested2")
+; CHECK-NEXT: DW_AT_declaration [DW_FORM_flag]      (0x01)
 ; CHECK: DW_TAG_typedef
 ; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + {{.*}} => {[[TYPE2]]})
 ; CHECK: DW_AT_name [DW_FORM_strp] {{.*}}= "baz2")
@@ -36,17 +39,20 @@
 ;   typedef bar baz2;
 ;   static int a;
 ;   struct Nested { };
+;   struct Nested2 { };
 ; };
 ; void test() {
 ;   baz B;
 ;   bar A[3];
 ;   D::baz2 B2;
 ;   D::Nested e;
+;   D::Nested2 *p;
 ; }
 
 %struct.C = type { i32 (...)** }
 %struct.bar = type { i8 }
 %"struct.D::Nested" = type { i8 }
+%"struct.D::Nested2" = type { i8 }
 
 @_ZTV1C = unnamed_addr constant [3 x i8*] [i8* null, i8* bitcast ({ i8*, i8* }* @_ZTI1C to i8*), i8* bitcast (void (%struct.C*)* @_ZN1C3fooEv to i8*)]
 @_ZTVN10__cxxabiv117__class_type_infoE = external global i8*
@@ -58,9 +64,9 @@ define void @_ZN1C3fooEv(%struct.C* %this) unnamed_addr #0 align 2 {
 entry:
   %this.addr = alloca %struct.C*, align 8
   store %struct.C* %this, %struct.C** %this.addr, align 8
-  call void @llvm.dbg.declare(metadata !{%struct.C** %this.addr}, metadata !29), !dbg !31
+  call void @llvm.dbg.declare(metadata !{%struct.C** %this.addr}, metadata !30), !dbg !32
   %this1 = load %struct.C** %this.addr
-  ret void, !dbg !32
+  ret void, !dbg !33
 }
 
 ; Function Attrs: nounwind readnone
@@ -73,23 +79,25 @@ entry:
   %A = alloca [3 x %struct.bar], align 1
   %B2 = alloca %struct.bar, align 1
   %e = alloca %"struct.D::Nested", align 1
-  call void @llvm.dbg.declare(metadata !{%struct.bar* %B}, metadata !33), !dbg !35
-  call void @llvm.dbg.declare(metadata !{[3 x %struct.bar]* %A}, metadata !36), !dbg !40
-  call void @llvm.dbg.declare(metadata !{%struct.bar* %B2}, metadata !41), !dbg !43
-  call void @llvm.dbg.declare(metadata !{%"struct.D::Nested"* %e}, metadata !44), !dbg !45
-  ret void, !dbg !46
+  %p = alloca %"struct.D::Nested2"*, align 8
+  call void @llvm.dbg.declare(metadata !{%struct.bar* %B}, metadata !34), !dbg !36
+  call void @llvm.dbg.declare(metadata !{[3 x %struct.bar]* %A}, metadata !37), !dbg !41
+  call void @llvm.dbg.declare(metadata !{%struct.bar* %B2}, metadata !42), !dbg !44
+  call void @llvm.dbg.declare(metadata !{%"struct.D::Nested"* %e}, metadata !45), !dbg !46
+  call void @llvm.dbg.declare(metadata !{%"struct.D::Nested2"** %p}, metadata !47), !dbg !49
+  ret void, !dbg !50
 }
 
 attributes #0 = { nounwind ssp uwtable "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
 attributes #1 = { nounwind readnone }
 
 !llvm.dbg.cu = !{!0}
-!llvm.module.flags = !{!28}
+!llvm.module.flags = !{!29}
 
-!0 = metadata !{i32 786449, metadata !1, i32 4, metadata !"clang version 3.4", i1 false, metadata !"", i32 0, metadata !2, metadata !3, metadata !23, metadata !2, metadata !2, metadata !""} ; [ DW_TAG_compile_unit ] [tmp.cpp] [DW_LANG_C_plus_plus]
+!0 = metadata !{i32 786449, metadata !1, i32 4, metadata !"clang version 3.4", i1 false, metadata !"", i32 0, metadata !2, metadata !3, metadata !24, metadata !2, metadata !2, metadata !""} ; [ DW_TAG_compile_unit ] [tmp.cpp] [DW_LANG_C_plus_plus]
 !1 = metadata !{metadata !"tmp.cpp", metadata !"."}
 !2 = metadata !{i32 0}
-!3 = metadata !{metadata !4, metadata !18, metadata !19, metadata !22}
+!3 = metadata !{metadata !4, metadata !18, metadata !19, metadata !22, metadata !23}
 !4 = metadata !{i32 786451, metadata !1, null, metadata !"C", i32 1, i64 64, i64 64, i32 0, i32 0, null, metadata !5, i32 0, metadata !"_ZTS1C", null, metadata !"_ZTS1C"} ; [ DW_TAG_structure_type ] [C] [line 1, size 64, align 64, offset 0] [def] [from ]
 !5 = metadata !{metadata !6, metadata !13}
 !6 = metadata !{i32 786445, metadata !1, metadata !7, metadata !"_vptr$C", i32 0, i64 64, i64 0, i64 0, i32 64, metadata !8} ; [ DW_TAG_member ] [_vptr$C] [line 0, size 64, align 0, offset 0] [artificial] [from ]
@@ -109,27 +117,31 @@ attributes #1 = { nounwind readnone }
 !20 = metadata !{metadata !21}
 !21 = metadata !{i32 786445, metadata !1, metadata !"_ZTS1D", metadata !"a", i32 11, i64 0, i64 0, i64 0, i32 4096, metadata !12, null} ; [ DW_TAG_member ] [a] [line 11, size 0, align 0, offset 0] [static] [from int]
 !22 = metadata !{i32 786451, metadata !1, metadata !"_ZTS1D", metadata !"Nested", i32 12, i64 8, i64 8, i32 0, i32 0, null, metadata !2, i32 0, null, null, metadata !"_ZTSN1D6NestedE"} ; [ DW_TAG_structure_type ] [Nested] [line 12, size 8, align 8, offset 0] [def] [from ]
-!23 = metadata !{metadata !24, metadata !25}
-!24 = metadata !{i32 786478, metadata !1, null, metadata !"foo", metadata !"foo", metadata !"_ZN1C3fooEv", i32 4, metadata !14, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, void (%struct.C*)* @_ZN1C3fooEv, null, metadata !13, metadata !2, i32 4} ; [ DW_TAG_subprogram ] [line 4] [def] [foo]
-!25 = metadata !{i32 786478, metadata !1, metadata !7, metadata !"test", metadata !"test", metadata !"_Z4testv", i32 15, metadata !26, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, void ()* @_Z4testv, null, null, metadata !2, i32 15} ; [ DW_TAG_subprogram ] [line 15] [def] [test]
-!26 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !27, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
-!27 = metadata !{null}
-!28 = metadata !{i32 2, metadata !"Dwarf Version", i32 2}
-!29 = metadata !{i32 786689, metadata !24, metadata !"this", null, i32 16777216, metadata !30, i32 1088, i32 0} ; [ DW_TAG_arg_variable ] [this] [line 0]
-!30 = metadata !{i32 786447, null, null, metadata !"", i32 0, i64 64, i64 64, i64 0, i32 0, metadata !"_ZTS1C"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTS1C]
-!31 = metadata !{i32 0, i32 0, metadata !24, null}
-!32 = metadata !{i32 5, i32 0, metadata !24, null}
-!33 = metadata !{i32 786688, metadata !25, metadata !"B", metadata !7, i32 16, metadata !34, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [B] [line 16]
-!34 = metadata !{i32 786454, metadata !1, null, metadata !"baz", i32 8, i64 0, i64 0, i64 0, i32 0, metadata !"_ZTS3bar"} ; [ DW_TAG_typedef ] [baz] [line 8, size 0, align 0, offset 0] [from _ZTS3bar]
-!35 = metadata !{i32 16, i32 0, metadata !25, null}
-!36 = metadata !{i32 786688, metadata !25, metadata !"A", metadata !7, i32 17, metadata !37, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [A] [line 17]
-!37 = metadata !{i32 786433, null, null, metadata !"", i32 0, i64 24, i64 8, i32 0, i32 0, metadata !"_ZTS3bar", metadata !38, i32 0, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 24, align 8, offset 0] [from _ZTS3bar]
-!38 = metadata !{metadata !39}
-!39 = metadata !{i32 786465, i64 0, i64 3}        ; [ DW_TAG_subrange_type ] [0, 2]
-!40 = metadata !{i32 17, i32 0, metadata !25, null}
-!41 = metadata !{i32 786688, metadata !25, metadata !"B2", metadata !7, i32 18, metadata !42, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [B2] [line 18]
-!42 = metadata !{i32 786454, metadata !1, metadata !"_ZTS1D", metadata !"baz2", i32 10, i64 0, i64 0, i64 0, i32 0, metadata !"_ZTS3bar"} ; [ DW_TAG_typedef ] [baz2] [line 10, size 0, align 0, offset 0] [from _ZTS3bar]
-!43 = metadata !{i32 18, i32 0, metadata !25, null}
-!44 = metadata !{i32 786688, metadata !25, metadata !"e", metadata !7, i32 19, metadata !22, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [e] [line 19]
-!45 = metadata !{i32 19, i32 0, metadata !25, null}
-!46 = metadata !{i32 20, i32 0, metadata !25, null}
+!23 = metadata !{i32 786451, metadata !1, metadata !"_ZTS1D", metadata !"Nested2", i32 13, i64 0, i64 0, i32 0, i32 4, null, null, i32 0, null, null, metadata !"_ZTSN1D7Nested2E"} ; [ DW_TAG_structure_type ] [Nested2] [line 13, size 0, align 0, offset 0] [decl] [from ]
+!24 = metadata !{metadata !25, metadata !26}
+!25 = metadata !{i32 786478, metadata !1, null, metadata !"foo", metadata !"foo", metadata !"_ZN1C3fooEv", i32 4, metadata !14, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, void (%struct.C*)* @_ZN1C3fooEv, null, metadata !13, metadata !2, i32 4} ; [ DW_TAG_subprogram ] [line 4] [def] [foo]
+!26 = metadata !{i32 786478, metadata !1, metadata !7, metadata !"test", metadata !"test", metadata !"_Z4testv", i32 16, metadata !27, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, void ()* @_Z4testv, null, null, metadata !2, i32 16} ; [ DW_TAG_subprogram ] [line 16] [def] [test]
+!27 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !28, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
+!28 = metadata !{null}
+!29 = metadata !{i32 2, metadata !"Dwarf Version", i32 2}
+!30 = metadata !{i32 786689, metadata !25, metadata !"this", null, i32 16777216, metadata !31, i32 1088, i32 0} ; [ DW_TAG_arg_variable ] [this] [line 0]
+!31 = metadata !{i32 786447, null, null, metadata !"", i32 0, i64 64, i64 64, i64 0, i32 0, metadata !"_ZTS1C"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTS1C]
+!32 = metadata !{i32 0, i32 0, metadata !25, null}
+!33 = metadata !{i32 5, i32 0, metadata !25, null}
+!34 = metadata !{i32 786688, metadata !26, metadata !"B", metadata !7, i32 17, metadata !35, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [B] [line 17]
+!35 = metadata !{i32 786454, metadata !1, null, metadata !"baz", i32 8, i64 0, i64 0, i64 0, i32 0, metadata !"_ZTS3bar"} ; [ DW_TAG_typedef ] [baz] [line 8, size 0, align 0, offset 0] [from _ZTS3bar]
+!36 = metadata !{i32 17, i32 0, metadata !26, null}
+!37 = metadata !{i32 786688, metadata !26, metadata !"A", metadata !7, i32 18, metadata !38, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [A] [line 18]
+!38 = metadata !{i32 786433, null, null, metadata !"", i32 0, i64 24, i64 8, i32 0, i32 0, metadata !"_ZTS3bar", metadata !39, i32 0, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 24, align 8, offset 0] [from _ZTS3bar]
+!39 = metadata !{metadata !40}
+!40 = metadata !{i32 786465, i64 0, i64 3}        ; [ DW_TAG_subrange_type ] [0, 2]
+!41 = metadata !{i32 18, i32 0, metadata !26, null}
+!42 = metadata !{i32 786688, metadata !26, metadata !"B2", metadata !7, i32 19, metadata !43, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [B2] [line 19]
+!43 = metadata !{i32 786454, metadata !1, metadata !"_ZTS1D", metadata !"baz2", i32 10, i64 0, i64 0, i64 0, i32 0, metadata !"_ZTS3bar"} ; [ DW_TAG_typedef ] [baz2] [line 10, size 0, align 0, offset 0] [from _ZTS3bar]
+!44 = metadata !{i32 19, i32 0, metadata !26, null}
+!45 = metadata !{i32 786688, metadata !26, metadata !"e", metadata !7, i32 20, metadata !22, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [e] [line 20]
+!46 = metadata !{i32 20, i32 0, metadata !26, null}
+!47 = metadata !{i32 786688, metadata !26, metadata !"p", metadata !7, i32 21, metadata !48, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [p] [line 21]
+!48 = metadata !{i32 786447, null, null, metadata !"", i32 0, i64 64, i64 64, i64 0, i32 0, metadata !"_ZTSN1D7Nested2E"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from _ZTSN1D7Nested2E]
+!49 = metadata !{i32 21, i32 0, metadata !26, null}
+!50 = metadata !{i32 22, i32 0, metadata !26, null}