[llvm] r192256 - Debug Info: In DIBuilder, the context field of a DICompositeType is updated
Manman Ren
manman.ren at gmail.com
Tue Oct 8 17:17:05 PDT 2013
Author: mren
Date: Tue Oct 8 19:17:04 2013
New Revision: 192256
URL: http://llvm.org/viewvc/llvm-project?rev=192256&view=rev
Log:
Debug Info: In DIBuilder, the context field of a DICompositeType is updated
to use DIScopeRef.
A paired commit at clang is required due to changes to DIBuilder.
Modified:
llvm/trunk/lib/IR/DIBuilder.cpp
llvm/trunk/test/DebugInfo/tu-composite.ll
Modified: llvm/trunk/lib/IR/DIBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DIBuilder.cpp?rev=192256&r1=192255&r2=192256&view=diff
==============================================================================
--- llvm/trunk/lib/IR/DIBuilder.cpp (original)
+++ llvm/trunk/lib/IR/DIBuilder.cpp Tue Oct 8 19:17:04 2013
@@ -616,7 +616,7 @@ DICompositeType DIBuilder::createClassTy
Value *Elts[] = {
GetTagConstant(VMContext, dwarf::DW_TAG_class_type),
File.getFileNode(),
- getNonCompileUnitScope(Context),
+ DIScope(getNonCompileUnitScope(Context)).getRef(),
MDString::get(VMContext, Name),
ConstantInt::get(Type::getInt32Ty(VMContext), LineNumber),
ConstantInt::get(Type::getInt64Ty(VMContext), SizeInBits),
@@ -653,7 +653,7 @@ DICompositeType DIBuilder::createStructT
Value *Elts[] = {
GetTagConstant(VMContext, dwarf::DW_TAG_structure_type),
File.getFileNode(),
- getNonCompileUnitScope(Context),
+ DIScope(getNonCompileUnitScope(Context)).getRef(),
MDString::get(VMContext, Name),
ConstantInt::get(Type::getInt32Ty(VMContext), LineNumber),
ConstantInt::get(Type::getInt64Ty(VMContext), SizeInBits),
@@ -687,7 +687,7 @@ DICompositeType DIBuilder::createUnionTy
Value *Elts[] = {
GetTagConstant(VMContext, dwarf::DW_TAG_union_type),
File.getFileNode(),
- getNonCompileUnitScope(Scope),
+ DIScope(getNonCompileUnitScope(Scope)).getRef(),
MDString::get(VMContext, Name),
ConstantInt::get(Type::getInt32Ty(VMContext), LineNumber),
ConstantInt::get(Type::getInt64Ty(VMContext), SizeInBits),
@@ -741,7 +741,7 @@ DICompositeType DIBuilder::createEnumera
Value *Elts[] = {
GetTagConstant(VMContext, dwarf::DW_TAG_enumeration_type),
File.getFileNode(),
- getNonCompileUnitScope(Scope),
+ DIScope(getNonCompileUnitScope(Scope)).getRef(),
MDString::get(VMContext, Name),
ConstantInt::get(Type::getInt32Ty(VMContext), LineNumber),
ConstantInt::get(Type::getInt64Ty(VMContext), SizeInBits),
Modified: llvm/trunk/test/DebugInfo/tu-composite.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/tu-composite.ll?rev=192256&r1=192255&r2=192256&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/tu-composite.ll (original)
+++ llvm/trunk/test/DebugInfo/tu-composite.ll Tue Oct 8 19:17:04 2013
@@ -11,6 +11,8 @@
; CHECK: DW_AT_name [DW_FORM_strp] {{.*}}= "D")
; CHECK: DW_TAG_member
; 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_typedef
; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + {{.*}} => {[[TYPE2]]})
; CHECK: DW_AT_name [DW_FORM_strp] {{.*}}= "baz2")
@@ -33,15 +35,18 @@
; struct D {
; typedef bar baz2;
; static int a;
+; struct Nested { };
; };
; void test() {
; baz B;
; bar A[3];
; D::baz2 B2;
+; D::Nested e;
; }
%struct.C = type { i32 (...)** }
%struct.bar = type { i8 }
+%"struct.D::Nested" = 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*
@@ -53,9 +58,9 @@ define void @_ZN1C3fooEv(%struct.C* %thi
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 !28), !dbg !30
+ call void @llvm.dbg.declare(metadata !{%struct.C** %this.addr}, metadata !29), !dbg !31
%this1 = load %struct.C** %this.addr
- ret void, !dbg !31
+ ret void, !dbg !32
}
; Function Attrs: nounwind readnone
@@ -67,22 +72,24 @@ entry:
%B = alloca %struct.bar, align 1
%A = alloca [3 x %struct.bar], align 1
%B2 = alloca %struct.bar, align 1
- call void @llvm.dbg.declare(metadata !{%struct.bar* %B}, metadata !32), !dbg !34
- call void @llvm.dbg.declare(metadata !{[3 x %struct.bar]* %A}, metadata !35), !dbg !39
- call void @llvm.dbg.declare(metadata !{%struct.bar* %B2}, metadata !40), !dbg !42
- ret void, !dbg !43
+ %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
}
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 = !{!27}
+!llvm.module.flags = !{!28}
-!0 = metadata !{i32 786449, metadata !1, i32 4, metadata !"clang version 3.4", i1 false, metadata !"", i32 0, metadata !2, metadata !3, metadata !22, 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 !23, 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}
+!3 = metadata !{metadata !4, metadata !18, metadata !19, metadata !22}
!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 ]
@@ -101,25 +108,28 @@ attributes #1 = { nounwind readnone }
!19 = metadata !{i32 786451, metadata !1, null, metadata !"D", i32 9, i64 8, i64 8, i32 0, i32 0, null, metadata !20, i32 0, null, null, metadata !"_ZTS1D"} ; [ DW_TAG_structure_type ] [D] [line 9, size 8, align 8, offset 0] [def] [from ]
!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 !{metadata !23, metadata !24}
-!23 = 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]
-!24 = metadata !{i32 786478, metadata !1, metadata !7, metadata !"test", metadata !"test", metadata !"_Z4testv", i32 13, metadata !25, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, void ()* @_Z4testv, null, null, metadata !2, i32 13} ; [ DW_TAG_subprogram ] [line 13] [def] [test]
-!25 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !26, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
-!26 = metadata !{null}
-!27 = metadata !{i32 2, metadata !"Dwarf Version", i32 2}
-!28 = metadata !{i32 786689, metadata !23, metadata !"this", null, i32 16777216, metadata !29, i32 1088, i32 0} ; [ DW_TAG_arg_variable ] [this] [line 0]
-!29 = 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]
-!30 = metadata !{i32 0, i32 0, metadata !23, null}
-!31 = metadata !{i32 5, i32 0, metadata !23, null}
-!32 = metadata !{i32 786688, metadata !24, metadata !"B", metadata !7, i32 14, metadata !33, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [B] [line 14]
-!33 = 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]
-!34 = metadata !{i32 14, i32 0, metadata !24, null}
-!35 = metadata !{i32 786688, metadata !24, metadata !"A", metadata !7, i32 15, metadata !36, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [A] [line 15]
-!36 = metadata !{i32 786433, null, null, metadata !"", i32 0, i64 24, i64 8, i32 0, i32 0, metadata !"_ZTS3bar", metadata !37, i32 0, null, null, null} ; [ DW_TAG_array_type ] [line 0, size 24, align 8, offset 0] [from _ZTS3bar]
-!37 = metadata !{metadata !38}
-!38 = metadata !{i32 786465, i64 0, i64 3} ; [ DW_TAG_subrange_type ] [0, 2]
-!39 = metadata !{i32 15, i32 0, metadata !24, null}
-!40 = metadata !{i32 786688, metadata !24, metadata !"B2", metadata !7, i32 16, metadata !41, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [B2] [line 16]
-!41 = 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]
-!42 = metadata !{i32 16, i32 0, metadata !24, null}
-!43 = metadata !{i32 17, i32 0, metadata !24, null}
+!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}
More information about the llvm-commits
mailing list