[llvm] r192246 - Debug Info: In DIBuilder, the derived-from field of DIDerivedType

Eric Christopher echristo at gmail.com
Wed Oct 9 17:22:43 PDT 2013


This testcase is starting to look a little convoluted - if you could
add names to the various debug info structures that you're looking for
it'd make changing/reviewing the testcase easier. Thanks.

-eric

On Tue, Oct 8, 2013 at 3:56 PM, Manman Ren <manman.ren at gmail.com> wrote:
> Author: mren
> Date: Tue Oct  8 17:56:31 2013
> New Revision: 192246
>
> URL: http://llvm.org/viewvc/llvm-project?rev=192246&view=rev
> Log:
> Debug Info: In DIBuilder, the derived-from field of DIDerivedType
> is updated to use DITypeRef.
>
> 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=192246&r1=192245&r2=192246&view=diff
> ==============================================================================
> --- llvm/trunk/lib/IR/DIBuilder.cpp (original)
> +++ llvm/trunk/lib/IR/DIBuilder.cpp Tue Oct  8 17:56:31 2013
> @@ -283,7 +283,7 @@ DIDerivedType DIBuilder::createQualified
>      ConstantInt::get(Type::getInt64Ty(VMContext), 0), // Align
>      ConstantInt::get(Type::getInt64Ty(VMContext), 0), // Offset
>      ConstantInt::get(Type::getInt32Ty(VMContext), 0), // Flags
> -    FromTy
> +    FromTy.getRef()
>    };
>    return DIDerivedType(MDNode::get(VMContext, Elts));
>  }
> @@ -321,7 +321,7 @@ DIDerivedType DIBuilder::createMemberPoi
>      ConstantInt::get(Type::getInt64Ty(VMContext), 0),
>      ConstantInt::get(Type::getInt64Ty(VMContext), 0), // Offset
>      ConstantInt::get(Type::getInt32Ty(VMContext), 0), // Flags
> -    PointeeTy,
> +    PointeeTy.getRef(),
>      Base.getRef()
>    };
>    return DIDerivedType(MDNode::get(VMContext, Elts));
> @@ -342,7 +342,7 @@ DIDerivedType DIBuilder::createReference
>      ConstantInt::get(Type::getInt64Ty(VMContext), 0), // Align
>      ConstantInt::get(Type::getInt64Ty(VMContext), 0), // Offset
>      ConstantInt::get(Type::getInt32Ty(VMContext), 0), // Flags
> -    RTy
> +    RTy.getRef()
>    };
>    return DIDerivedType(MDNode::get(VMContext, Elts));
>  }
> @@ -362,7 +362,7 @@ DIDerivedType DIBuilder::createTypedef(D
>      ConstantInt::get(Type::getInt64Ty(VMContext), 0), // Align
>      ConstantInt::get(Type::getInt64Ty(VMContext), 0), // Offset
>      ConstantInt::get(Type::getInt32Ty(VMContext), 0), // Flags
> -    Ty
> +    Ty.getRef()
>    };
>    return DIDerivedType(MDNode::get(VMContext, Elts));
>  }
> @@ -382,7 +382,7 @@ DIDerivedType DIBuilder::createFriend(DI
>      ConstantInt::get(Type::getInt64Ty(VMContext), 0), // Align
>      ConstantInt::get(Type::getInt64Ty(VMContext), 0), // Offset
>      ConstantInt::get(Type::getInt32Ty(VMContext), 0), // Flags
> -    FriendTy
> +    FriendTy.getRef()
>    };
>    return DIDerivedType(MDNode::get(VMContext, Elts));
>  }
> @@ -403,7 +403,7 @@ DIDerivedType DIBuilder::createInheritan
>      ConstantInt::get(Type::getInt64Ty(VMContext), 0), // Align
>      ConstantInt::get(Type::getInt64Ty(VMContext), BaseOffset),
>      ConstantInt::get(Type::getInt32Ty(VMContext), Flags),
> -    BaseTy
> +    BaseTy.getRef()
>    };
>    return DIDerivedType(MDNode::get(VMContext, Elts));
>  }
> @@ -424,7 +424,7 @@ DIDerivedType DIBuilder::createMemberTyp
>      ConstantInt::get(Type::getInt64Ty(VMContext), AlignInBits),
>      ConstantInt::get(Type::getInt64Ty(VMContext), OffsetInBits),
>      ConstantInt::get(Type::getInt32Ty(VMContext), Flags),
> -    Ty
> +    Ty.getRef()
>    };
>    return DIDerivedType(MDNode::get(VMContext, Elts));
>  }
> @@ -448,7 +448,7 @@ DIBuilder::createStaticMemberType(DIDesc
>      ConstantInt::get(Type::getInt64Ty(VMContext), 0/*AlignInBits*/),
>      ConstantInt::get(Type::getInt64Ty(VMContext), 0/*OffsetInBits*/),
>      ConstantInt::get(Type::getInt32Ty(VMContext), Flags),
> -    Ty,
> +    Ty.getRef(),
>      Val
>    };
>    return DIDerivedType(MDNode::get(VMContext, Elts));
>
> Modified: llvm/trunk/test/DebugInfo/tu-composite.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/tu-composite.ll?rev=192246&r1=192245&r2=192246&view=diff
> ==============================================================================
> --- llvm/trunk/test/DebugInfo/tu-composite.ll (original)
> +++ llvm/trunk/test/DebugInfo/tu-composite.ll Tue Oct  8 17:56:31 2013
> @@ -6,16 +6,26 @@
>  ; CHECK-NEXT: DW_AT_containing_type [DW_FORM_ref4]       (cu + {{.*}} => {[[TYPE]]})
>  ; CHECK: [[SP:.*]]: DW_TAG_subprogram
>  ; CHECK: DW_AT_containing_type [DW_FORM_ref4]       (cu + {{.*}} => {[[TYPE]]})
> +; CHECK: [[TYPE2:.*]]: DW_TAG_structure_type
>  ; CHECK: DW_TAG_pointer_type
>  ; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + {{.*}} => {[[TYPE]]})
> +; CHECK: DW_TAG_typedef
> +; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + {{.*}} => {[[TYPE2]]})
>  ; IR generated from clang -g with the following source:
>  ; struct C {
>  ;   virtual void foo();
>  ; };
>  ; void C::foo() {
>  ; }
> +;
> +; struct bar { };
> +; typedef bar baz;
> +; void test() {
> +;   baz B;
> +; }
>
>  %struct.C = type { i32 (...)** }
> +%struct.bar = 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*
> @@ -27,24 +37,32 @@ 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 !21), !dbg !23
> +  call void @llvm.dbg.declare(metadata !{%struct.C** %this.addr}, metadata !25), !dbg !27
>    %this1 = load %struct.C** %this.addr
> -  ret void, !dbg !24
> +  ret void, !dbg !28
>  }
>
>  ; Function Attrs: nounwind readnone
>  declare void @llvm.dbg.declare(metadata, metadata) #1
>
> +; Function Attrs: nounwind ssp uwtable
> +define void @_Z4testv() #0 {
> +entry:
> +  %B = alloca %struct.bar, align 1
> +  call void @llvm.dbg.declare(metadata !{%struct.bar* %B}, metadata !29), !dbg !31
> +  ret void, !dbg !32
> +}
> +
>  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 = !{!20}
> +!llvm.module.flags = !{!24}
>
> -!0 = metadata !{i32 786449, metadata !1, i32 4, metadata !"clang version 3.4 (trunk 190115)", i1 false, metadata !"", i32 0, metadata !2, metadata !3, metadata !18, 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 !19, 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}
> +!3 = metadata !{metadata !4, metadata !18}
>  !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 ]
> @@ -59,10 +77,18 @@ attributes #1 = { nounwind readnone }
>  !15 = metadata !{null, metadata !16}
>  !16 = metadata !{i32 786447, null, null, metadata !"", i32 0, i64 64, i64 64, i64 0, i32 1088, metadata !"_ZTS1C"} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [artificial] [from _ZTS1C]
>  !17 = metadata !{i32 786468}
> -!18 = metadata !{metadata !19}
> -!19 = 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]
> -!20 = metadata !{i32 2, metadata !"Dwarf Version", i32 2}
> -!21 = metadata !{i32 786689, metadata !19, metadata !"this", null, i32 16777216, metadata !22, i32 1088, i32 0} ; [ DW_TAG_arg_variable ] [this] [line 0]
> -!22 = 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]
> -!23 = metadata !{i32 0, i32 0, metadata !19, null}
> -!24 = metadata !{i32 5, i32 0, metadata !19, null}
> +!18 = metadata !{i32 786451, metadata !1, null, metadata !"bar", i32 7, i64 8, i64 8, i32 0, i32 0, null, metadata !2, i32 0, null, null, metadata !"_ZTS3bar"} ; [ DW_TAG_structure_type ] [bar] [line 7, size 8, align 8, offset 0] [def] [from ]
> +!19 = metadata !{metadata !20, metadata !21}
> +!20 = 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]
> +!21 = metadata !{i32 786478, metadata !1, metadata !7, metadata !"test", metadata !"test", metadata !"_Z4testv", i32 9, metadata !22, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, void ()* @_Z4testv, null, null, metadata !2, i32 9} ; [ DW_TAG_subprogram ] [line 9] [def] [test]
> +!22 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !23, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
> +!23 = metadata !{null}
> +!24 = metadata !{i32 2, metadata !"Dwarf Version", i32 2}
> +!25 = metadata !{i32 786689, metadata !20, metadata !"this", null, i32 16777216, metadata !26, i32 1088, i32 0} ; [ DW_TAG_arg_variable ] [this] [line 0]
> +!26 = 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]
> +!27 = metadata !{i32 0, i32 0, metadata !20, null}
> +!28 = metadata !{i32 5, i32 0, metadata !20, null}
> +!29 = metadata !{i32 786688, metadata !21, metadata !"B", metadata !7, i32 10, metadata !30, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [B] [line 10]
> +!30 = 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]
> +!31 = metadata !{i32 10, i32 0, metadata !21, null}
> +!32 = metadata !{i32 11, i32 0, metadata !21, null}
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits




More information about the llvm-commits mailing list