<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Sep 6, 2013 at 11:46 AM, Manman Ren <span dir="ltr"><<a href="mailto:manman.ren@gmail.com" target="_blank">manman.ren@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: mren<br>
Date: Fri Sep 6 13:46:00 2013<br>
New Revision: 190190<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=190190&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=190190&view=rev</a><br>
Log:<br>
Debug Info: Use identifier to reference DIType in containing type field of<br>
a DICompositeType.<br>
<br>
Verifier is updated accordingly.<br>
<br>
Added:<br>
llvm/trunk/test/DebugInfo/tu-composite.ll<br>
Modified:<br>
llvm/trunk/include/llvm/DebugInfo.h<br>
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp<br>
llvm/trunk/lib/IR/DIBuilder.cpp<br>
llvm/trunk/lib/IR/DebugInfo.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/DebugInfo.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo.h?rev=190190&r1=190189&r2=190190&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo.h?rev=190190&r1=190189&r2=190190&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/DebugInfo.h (original)<br>
+++ llvm/trunk/include/llvm/DebugInfo.h Fri Sep 6 13:46:00 2013<br>
@@ -358,8 +358,8 @@ namespace llvm {<br>
void setTypeArray(DIArray Elements, DIArray TParams = DIArray());<br>
void addMember(DIDescriptor D);<br>
unsigned getRunTimeLang() const { return getUnsignedField(11); }<br>
- DICompositeType getContainingType() const {<br>
- return getFieldAs<DICompositeType>(12);<br>
+ DITypeRef getContainingType() const {<br>
+ return getFieldAs<DITypeRef>(12);<br>
}<br>
void setContainingType(DICompositeType ContainingType);<br>
DIArray getTemplateParams() const { return getFieldAs<DIArray>(13); }<br>
<br>
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp?rev=190190&r1=190189&r2=190190&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp?rev=190190&r1=190189&r2=190190&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp Fri Sep 6 13:46:00 2013<br>
@@ -1083,7 +1083,7 @@ void CompileUnit::constructTypeDIE(DIE &<br>
if (CTy.isAppleBlockExtension())<br>
addFlag(&Buffer, dwarf::DW_AT_APPLE_block);<br>
<br>
- DICompositeType ContainingType = CTy.getContainingType();<br>
+ DICompositeType ContainingType(DD->resolve(CTy.getContainingType()));<br>
if (DIDescriptor(ContainingType).isCompositeType())<br>
addDIEEntry(&Buffer, dwarf::DW_AT_containing_type, dwarf::DW_FORM_ref4,<br>
getOrCreateTypeDIE(DIType(ContainingType)));<br>
<br>
Modified: llvm/trunk/lib/IR/DIBuilder.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DIBuilder.cpp?rev=190190&r1=190189&r2=190190&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DIBuilder.cpp?rev=190190&r1=190189&r2=190190&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/IR/DIBuilder.cpp (original)<br>
+++ llvm/trunk/lib/IR/DIBuilder.cpp Fri Sep 6 13:46:00 2013<br>
@@ -626,7 +626,7 @@ DICompositeType DIBuilder::createClassTy<br>
DerivedFrom,<br>
Elements,<br>
ConstantInt::get(Type::getInt32Ty(VMContext), 0),<br>
- VTableHolder,<br>
+ DIType(VTableHolder).generateRef(),<br></blockquote><div><br></div><div>Could we make the VTableHolder parameter a DIType so we don't need to cast here (& improve the type-correctness of this function)?</div>
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
TemplateParams,<br>
UniqueIdentifier.empty() ? NULL : MDString::get(VMContext, UniqueIdentifier)<br>
};<br>
@@ -663,7 +663,7 @@ DICompositeType DIBuilder::createStructT<br>
DerivedFrom,<br>
Elements,<br>
ConstantInt::get(Type::getInt32Ty(VMContext), RunTimeLang),<br>
- VTableHolder,<br>
+ DIType(VTableHolder).generateRef(),<br></blockquote><div><br></div><div>and here.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
NULL,<br>
UniqueIdentifier.empty() ? NULL : MDString::get(VMContext, UniqueIdentifier)<br>
};<br>
<br>
Modified: llvm/trunk/lib/IR/DebugInfo.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DebugInfo.cpp?rev=190190&r1=190189&r2=190190&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DebugInfo.cpp?rev=190190&r1=190189&r2=190190&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/IR/DebugInfo.cpp (original)<br>
+++ llvm/trunk/lib/IR/DebugInfo.cpp Fri Sep 6 13:46:00 2013<br>
@@ -497,7 +497,7 @@ bool DICompositeType::Verify() const {<br>
// Make sure DerivedFrom @ field 9 and ContainingType @ field 12 are MDNodes.<br>
if (!fieldIsMDNode(DbgNode, 9))<br>
return false;<br>
- if (!fieldIsMDNode(DbgNode, 12))<br>
+ if (!fieldIsTypeRef(DbgNode, 12))<br>
return false;<br>
<br>
// Make sure the type identifier at field 14 is MDString, it can be null.<br>
@@ -721,7 +721,7 @@ DITypeRef DIType::generateRef() {<br>
/// \brief Set the containing type.<br>
void DICompositeType::setContainingType(DICompositeType ContainingType) {<br>
TrackingVH<MDNode> N(*this);<br>
- N->replaceOperandWith(12, ContainingType);<br>
+ N->replaceOperandWith(12, ContainingType.generateRef());<br>
DbgNode = N;<br>
}<br>
<br>
<br>
Added: llvm/trunk/test/DebugInfo/tu-composite.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/tu-composite.ll?rev=190190&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/tu-composite.ll?rev=190190&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/DebugInfo/tu-composite.ll (added)<br>
+++ llvm/trunk/test/DebugInfo/tu-composite.ll Fri Sep 6 13:46:00 2013<br></blockquote><div><br></div><div>Did we not have any tests already covering this functionality? or that could be extended to do so? We generally try not to add new test cases if there's a good home to cover the functionality already.</div>
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
@@ -0,0 +1,64 @@<br>
+; REQUIRES: object-emission<br>
+<br>
+; RUN: llc -filetype=obj -O0 < %s > %t<br>
+; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s<br>
+; CHECK: [[TYPE:.*]]: DW_TAG_structure_type<br>
+; CHECK-NEXT: DW_AT_containing_type [DW_FORM_ref4] (cu + {{.*}} => {[[TYPE]]})<br>
+; IR generated from clang -g with the following source:<br>
+; struct C {<br>
+; virtual void foo();<br>
+; };<br>
+; void C::foo() {<br>
+; }<br>
+<br>
+%struct.C = type { i32 (...)** }<br>
+<br>
+@_ZTV1C = unnamed_addr constant [3 x i8*] [i8* null, i8* bitcast ({ i8*, i8* }* @_ZTI1C to i8*), i8* bitcast (void (%struct.C*)* @_ZN1C3fooEv to i8*)]<br>
+@_ZTVN10__cxxabiv117__class_type_infoE = external global i8*<br>
+@_ZTS1C = constant [3 x i8] c"1C\00"<br>
+@_ZTI1C = unnamed_addr constant { i8*, i8* } { i8* bitcast (i8** getelementptr inbounds (i8** @_ZTVN10__cxxabiv117__class_type_infoE, i64 2) to i8*), i8* getelementptr inbounds ([3 x i8]* @_ZTS1C, i32 0, i32 0) }<br>
+<br>
+; Function Attrs: nounwind ssp uwtable<br>
+define void @_ZN1C3fooEv(%struct.C* %this) unnamed_addr #0 align 2 {<br>
+entry:<br>
+ %this.addr = alloca %struct.C*, align 8<br>
+ store %struct.C* %this, %struct.C** %this.addr, align 8<br>
+ call void @llvm.dbg.declare(metadata !{%struct.C** %this.addr}, metadata !21), !dbg !23<br>
+ %this1 = load %struct.C** %this.addr<br>
+ ret void, !dbg !24<br>
+}<br>
+<br>
+; Function Attrs: nounwind readnone<br>
+declare void @llvm.dbg.declare(metadata, metadata) #1<br>
+<br>
+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" }<br>
+attributes #1 = { nounwind readnone }<br>
+<br>
+!<a href="http://llvm.dbg.cu" target="_blank">llvm.dbg.cu</a> = !{!0}<br>
+!llvm.module.flags = !{!20}<br>
+<br>
+!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]<br>
+!1 = metadata !{metadata !"tmp.cpp", metadata !"."}<br>
+!2 = metadata !{i32 0}<br>
+!3 = metadata !{metadata !4}<br>
+!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 ]<br>
+!5 = metadata !{metadata !6, metadata !13}<br>
+!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 ]<br>
+!7 = metadata !{i32 786473, metadata !1} ; [ DW_TAG_file_type ] [tmp.cpp]<br>
+!8 = metadata !{i32 786447, null, null, metadata !"", i32 0, i64 64, i64 0, i64 0, i32 0, metadata !9} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 0, offset 0] [from __vtbl_ptr_type]<br>
+!9 = metadata !{i32 786447, null, null, metadata !"__vtbl_ptr_type", i32 0, i64 64, i64 0, i64 0, i32 0, metadata !10} ; [ DW_TAG_pointer_type ] [__vtbl_ptr_type] [line 0, size 64, align 0, offset 0] [from ]<br>
+!10 = metadata !{i32 786453, i32 0, i32 0, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !11, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
+!11 = metadata !{metadata !12}<br>
+!12 = metadata !{i32 786468, null, null, metadata !"int", i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]<br>
+!13 = metadata !{i32 786478, metadata !1, metadata !4, metadata !"foo", metadata !"foo", metadata !"_ZN1C3fooEv", i32 2, metadata !14, i1 false, i1 false, i32 1, i32 0, metadata !4, i32 256, i1 false, null, null, i32 0, metadata !17, i32 2} ; [ DW_TAG_subprogram ] [line 2] [foo]<br>
+!14 = metadata !{i32 786453, i32 0, i32 0, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !15, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
+!15 = metadata !{null, metadata !16}<br>
+!16 = metadata !{i32 786447, i32 0, i32 0, metadata !"", i32 0, i64 64, i64 64, i64 0, i32 1088, metadata !4} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [artificial] [from C]<br>
+!17 = metadata !{i32 786468}<br>
+!18 = metadata !{metadata !19}<br>
+!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]<br>
+!20 = metadata !{i32 2, metadata !"Dwarf Version", i32 2}<br>
+!21 = metadata !{i32 786689, metadata !19, metadata !"this", null, i32 16777216, metadata !22, i32 1088, i32 0} ; [ DW_TAG_arg_variable ] [this] [line 0]<br>
+!22 = metadata !{i32 786447, null, null, metadata !"", i32 0, i64 64, i64 64, i64 0, i32 0, metadata !4} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from C]<br>
+!23 = metadata !{i32 0, i32 0, metadata !19, null}<br>
+!24 = metadata !{i32 5, i32 0, metadata !19, null}<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>