<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, Sep 9, 2013 at 1:21 PM, David Blaikie <span dir="ltr"><<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote"><div><div class="h5">On Mon, Sep 9, 2013 at 12:47 PM, 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: Mon Sep 9 14:47:11 2013<br>
New Revision: 190334<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=190334&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=190334&view=rev</a><br>
Log:<br>
Debug Info: Use DIScopeRef for DIType::getContext.<br>
<br>
In DIBuilder, the context field of a TAG_member is updated to use the<br>
scope reference. Verifier is updated accordingly.<br>
<br>
DebugInfoFinder now needs to generate a type identifier map to have<br>
access to the actual scope. Same applies for BreakpointPrinter.<br>
<br>
processModule of DebugInfoFinder is called during initialization phase<br>
of the verifier to make sure the type identifier map is constructed early<br>
enough.<br>
<br>
We are now able to unique a simple class as demonstrated by the added<br>
testing case.<br>
<br>
Added:<br>
llvm/trunk/test/Linker/type-unique-simple-a.ll<br>
llvm/trunk/test/Linker/type-unique-simple-b.ll<br>
Modified:<br>
llvm/trunk/include/llvm/DebugInfo.h<br>
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp<br>
llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp<br>
llvm/trunk/lib/IR/DIBuilder.cpp<br>
llvm/trunk/lib/IR/DebugInfo.cpp<br>
llvm/trunk/lib/IR/Verifier.cpp<br>
llvm/trunk/tools/opt/opt.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=190334&r1=190333&r2=190334&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo.h?rev=190334&r1=190333&r2=190334&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/DebugInfo.h (original)<br>
+++ llvm/trunk/include/llvm/DebugInfo.h Mon Sep 9 14:47:11 2013<br>
@@ -237,7 +237,7 @@ namespace llvm {<br>
/// Verify - Verify that a type descriptor is well formed.<br>
bool Verify() const;<br>
<br>
- DIScope getContext() const { return getFieldAs<DIScope>(2); }<br>
+ DIScopeRef getContext() const { return getFieldAs<DIScopeRef>(2); }<br>
StringRef getName() const { return getStringField(3); }<br>
unsigned getLineNumber() const { return getUnsignedField(4); }<br>
uint64_t getSizeInBits() const { return getUInt64Field(5); }<br>
@@ -820,6 +820,7 @@ namespace llvm {<br>
SmallVector<MDNode *, 8> TYs; // Types<br>
SmallVector<MDNode *, 8> Scopes; // Scopes<br>
SmallPtrSet<MDNode *, 64> NodesSeen;<br>
+ DITypeIdentifierMap TypeIdentifierMap;<br>
};<br>
} // end namespace llvm<br>
<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=190334&r1=190333&r2=190334&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp?rev=190334&r1=190333&r2=190334&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp Mon Sep 9 14:47:11 2013<br>
@@ -800,7 +800,7 @@ DIE *CompileUnit::getOrCreateTypeDIE(con<br>
addAccelType(Ty.getName(), std::make_pair(TyDIE, Flags));<br>
}<br>
<br>
- addToContextOwner(TyDIE, Ty.getContext());<br>
+ addToContextOwner(TyDIE, DD->resolve(Ty.getContext()));<br>
return TyDIE;<br>
}<br>
<br>
@@ -832,7 +832,7 @@ void CompileUnit::addType(DIE *Entity, D<br>
/// addGlobalType - Add a new global type to the compile unit.<br>
///<br>
void CompileUnit::addGlobalType(DIType Ty) {<br>
- DIDescriptor Context = Ty.getContext();<br>
+ DIDescriptor Context = DD->resolve(Ty.getContext());<br>
if (Ty.isCompositeType() && !Ty.getName().empty() && !Ty.isForwardDecl()<br>
&& (!Context || Context.isCompileUnit() || Context.isFile()<br>
|| Context.isNameSpace()))<br>
@@ -914,7 +914,7 @@ void CompileUnit::constructTypeDIE(DIE &<br>
/// Return true if the type is appropriately scoped to be contained inside<br>
/// its own type unit.<br>
static bool isTypeUnitScoped(DIType Ty, const DwarfDebug *DD) {<br>
- DIScope Parent = Ty.getContext();<br>
+ DIScope Parent = DD->resolve(Ty.getContext());<br>
while (Parent) {<br>
// Don't generate a hash for anything scoped inside a function.<br>
if (Parent.isSubprogram())<br>
@@ -1088,7 +1088,7 @@ void CompileUnit::constructTypeDIE(DIE &<br>
addDIEEntry(&Buffer, dwarf::DW_AT_containing_type, dwarf::DW_FORM_ref4,<br>
getOrCreateTypeDIE(DIType(ContainingType)));<br>
else<br>
- addToContextOwner(&Buffer, CTy.getContext());<br>
+ addToContextOwner(&Buffer, DD->resolve(CTy.getContext()));<br>
<br>
if (CTy.isObjcClassComplete())<br>
addFlag(&Buffer, dwarf::DW_AT_APPLE_objc_complete_type);<br>
@@ -1373,7 +1373,7 @@ void CompileUnit::createGlobalVariableDI<br>
// We need the declaration DIE that is in the static member's class.<br>
// But that class might not exist in the DWARF yet.<br>
// Creating the class will create the static member decl DIE.<br>
- getOrCreateContextDIE(SDMDecl.getContext());<br>
+ getOrCreateContextDIE(DD->resolve(SDMDecl.getContext()));<br>
VariableDIE = getDIE(SDMDecl);<br>
assert(VariableDIE && "Static member decl has no context?");<br>
IsStaticMember = true;<br>
<br>
Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=190334&r1=190333&r2=190334&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=190334&r1=190333&r2=190334&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Mon Sep 9 14:47:11 2013<br>
@@ -341,7 +341,7 @@ bool DwarfDebug::isSubprogramContext(con<br>
if (D.isSubprogram())<br>
return true;<br>
if (D.isType())<br>
- return isSubprogramContext(DIType(Context).getContext());<br>
+ return isSubprogramContext(resolve(DIType(Context).getContext()));<br>
return false;<br>
}<br>
<br>
@@ -2656,7 +2656,7 @@ DIScope DwarfDebug::resolve(DIScopeRef S<br>
DIScope DwarfDebug::getScopeContext(DIScope S) const {<br>
<br>
if (S.isType())<br>
- return DIType(S).getContext();<br>
+ return resolve(DIType(S).getContext());<br>
<br>
if (S.isSubprogram())<br>
return DISubprogram(S).getContext();<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=190334&r1=190333&r2=190334&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DIBuilder.cpp?rev=190334&r1=190333&r2=190334&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/IR/DIBuilder.cpp (original)<br>
+++ llvm/trunk/lib/IR/DIBuilder.cpp Mon Sep 9 14:47:11 2013<br>
@@ -417,7 +417,7 @@ DIDerivedType DIBuilder::createMemberTyp<br>
Value *Elts[] = {<br>
GetTagConstant(VMContext, dwarf::DW_TAG_member),<br>
File.getFileNode(),<br>
- getNonCompileUnitScope(Scope),<br>
+ DIScope(getNonCompileUnitScope(Scope)).generateRef(),<br>
MDString::get(VMContext, Name),<br>
ConstantInt::get(Type::getInt32Ty(VMContext), LineNumber),<br>
ConstantInt::get(Type::getInt64Ty(VMContext), SizeInBits),<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=190334&r1=190333&r2=190334&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DebugInfo.cpp?rev=190334&r1=190333&r2=190334&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/IR/DebugInfo.cpp (original)<br>
+++ llvm/trunk/lib/IR/DebugInfo.cpp Mon Sep 9 14:47:11 2013<br>
@@ -446,12 +446,18 @@ static bool isScopeRef(const Value *Val)<br>
(isa<MDNode>(Val) && DIScope(cast<MDNode>(Val)).isScope());<br>
}<br>
<br>
+/// Check if a field at position Elt of a MDNode can be a ScopeRef.<br>
+static bool fieldIsScopeRef(const MDNode *DbgNode, unsigned Elt) {<br>
+ Value *Fld = getField(DbgNode, Elt);<br>
+ return isScopeRef(Fld);<br>
+}<br>
+<br>
/// Verify - Verify that a type descriptor is well formed.<br>
bool DIType::Verify() const {<br>
if (!isType())<br>
return false;<br>
// Make sure Context @ field 2 is MDNode.<br>
- if (!fieldIsMDNode(DbgNode, 2))<br>
+ if (!fieldIsScopeRef(DbgNode, 2))<br>
return false;<br>
<br>
// FIXME: Sink this into the various subclass verifies.<br>
@@ -956,11 +962,13 @@ void DebugInfoFinder::reset() {<br>
TYs.clear();<br>
Scopes.clear();<br>
NodesSeen.clear();<br>
+ TypeIdentifierMap.clear();<br>
}<br>
<br>
/// processModule - Process entire module and collect debug info.<br>
void DebugInfoFinder::processModule(const Module &M) {<br>
if (NamedMDNode *CU_Nodes = M.getNamedMetadata("<a href="http://llvm.dbg.cu" target="_blank">llvm.dbg.cu</a>")) {<br>
+ TypeIdentifierMap = generateDITypeIdentifierMap(CU_Nodes);<br>
for (unsigned i = 0, e = CU_Nodes->getNumOperands(); i != e; ++i) {<br>
DICompileUnit CU(CU_Nodes->getOperand(i));<br>
addCompileUnit(CU);<br>
@@ -1010,7 +1018,7 @@ void DebugInfoFinder::processLocation(DI<br>
void DebugInfoFinder::processType(DIType DT) {<br>
if (!addType(DT))<br>
return;<br>
- processScope(DT.getContext());<br>
+ processScope(DT.getContext().resolve(TypeIdentifierMap));<br>
if (DT.isCompositeType()) {<br>
DICompositeType DCT(DT);<br>
processType(DCT.getTypeDerivedFrom());<br>
<br>
Modified: llvm/trunk/lib/IR/Verifier.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Verifier.cpp?rev=190334&r1=190333&r2=190334&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Verifier.cpp?rev=190334&r1=190333&r2=190334&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/IR/Verifier.cpp (original)<br>
+++ llvm/trunk/lib/IR/Verifier.cpp Mon Sep 9 14:47:11 2013<br>
@@ -170,6 +170,8 @@ namespace {<br>
Finder.reset();<br>
<br>
DL = getAnalysisIfAvailable<DataLayout>();<br>
+ if (!DisableDebugInfoVerifier)<br>
+ Finder.processModule(M);<br>
<br>
// We must abort before returning back to the pass manager, or else the<br>
// pass manager may try to run other passes on the broken module.<br>
@@ -2305,8 +2307,6 @@ void Verifier::visitIntrinsicFunctionCal<br>
void Verifier::verifyDebugInfo(Module &M) {<br>
// Verify Debug Info.<br>
if (!DisableDebugInfoVerifier) {<br>
- Finder.processModule(M);<br>
-<br>
for (DebugInfoFinder::iterator I = Finder.compile_unit_begin(),<br>
E = Finder.compile_unit_end(); I != E; ++I)<br>
Assert1(DICompileUnit(*I).Verify(), "DICompileUnit does not Verify!", *I);<br>
<br>
Added: llvm/trunk/test/Linker/type-unique-simple-a.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-simple-a.ll?rev=190334&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-simple-a.ll?rev=190334&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/type-unique-simple-a.ll (added)<br>
+++ llvm/trunk/test/Linker/type-unique-simple-a.ll Mon Sep 9 14:47:11 2013<br>
@@ -0,0 +1,73 @@<br>
+; RUN: llvm-link %s %p/type-unique-simple-b.ll -S -o - | FileCheck %s<br>
+<br>
+; CHECK: DW_TAG_structure_type<br>
+; CHECK-NOT: DW_TAG_structure_type<br>
+; Content of header files:<br>
+; struct Base {<br>
+; int a;<br>
+; //Base *b;<br></blockquote><div><br></div></div></div><div>What's this commented out line for?</div></div></div></div></blockquote><div>Oops, I used a script to generate this testing case and didn't notice this commented out line.</div>
<div>I will update this testing case. </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div><div class="h5">
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+; };<br>
+; Content of foo.cpp:<br>
+;<br>
+; #include "a.hpp"<br>
+; void f(int a) {<br>
+; Base t;<br>
+; }<br>
+; Content of bar.cpp:<br>
+;<br>
+; #include "a.hpp"<br>
+; void f(int);<br>
+; void g(int a) {<br>
+; Base t;<br>
+; }<br>
+; int main() {<br>
+; f(0);<br>
+; g(1);<br>
+; return 0;<br>
+; }<br>
+; ModuleID = 'foo.cpp'<br>
+target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"<br>
+target triple = "x86_64-apple-macosx10.8.0"<br>
+<br>
+%struct.Base = type { i32 }<br>
+<br>
+; Function Attrs: nounwind ssp uwtable<br>
+define void @_Z1fi(i32 %a) #0 {<br>
+entry:<br>
+ %a.addr = alloca i32, align 4<br>
+ %t = alloca %struct.Base, align 4<br>
+ store i32 %a, i32* %a.addr, align 4<br>
+ call void @llvm.dbg.declare(metadata !{i32* %a.addr}, metadata !15), !dbg !16<br>
+ call void @llvm.dbg.declare(metadata !{%struct.Base* %t}, metadata !17), !dbg !18<br>
+ ret void, !dbg !19<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 = !{!14}<br>
+<br>
+!0 = metadata !{i32 786449, metadata !1, i32 4, metadata !"clang version 3.4 (<a href="http://llvm.org/git/clang.git" target="_blank">http://llvm.org/git/clang.git</a> c23b1db6268c8e7ce64026d57d1510c1aac200a0) (<a href="http://llvm.org/git/llvm.git" target="_blank">http://llvm.org/git/llvm.git</a> 09b98fe3978eddefc2145adc1056cf21580ce945)", i1 false, metadata !"", i32 0, metadata !2, metadata !3, metadata !9, metadata !2, metadata !2, metadata !""} ; [ DW_TAG_compile_unit ] [/Users/mren/c_testing/type_unique_air/simple/foo.cpp] [DW_LANG_C_plus_plus]<br>
+!1 = metadata !{metadata !"foo.cpp", metadata !"/Users/mren/c_testing/type_unique_air/simple"}<br>
+!2 = metadata !{i32 0}<br>
+!3 = metadata !{metadata !4}<br>
+!4 = metadata !{i32 786451, metadata !5, null, metadata !"Base", i32 1, i64 32, i64 32, i32 0, i32 0, null, metadata !6, i32 0, null, null, metadata !"_ZTS4Base"} ; [ DW_TAG_structure_type ] [Base] [line 1, size 32, align 32, offset 0] [def] [from ]<br>
+!5 = metadata !{metadata !"./a.hpp", metadata !"/Users/mren/c_testing/type_unique_air/simple"}<br>
+!6 = metadata !{metadata !7}<br>
+!7 = metadata !{i32 786445, metadata !5, metadata !"_ZTS4Base", metadata !"a", i32 2, i64 32, i64 32, i64 0, i32 0, metadata !8} ; [ DW_TAG_member ] [a] [line 2, size 32, align 32, offset 0] [from int]<br>
+!8 = 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>
+!9 = metadata !{metadata !10}<br>
+!10 = metadata !{i32 786478, metadata !1, metadata !11, metadata !"f", metadata !"f", metadata !"_Z1fi", i32 3, metadata !12, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, void (i32)* @_Z1fi, null, null, metadata !2, i32 3} ; [ DW_TAG_subprogram ] [line 3] [def] [f]<br>
+!11 = metadata !{i32 786473, metadata !1} ; [ DW_TAG_file_type ] [/Users/mren/c_testing/type_unique_air/simple/foo.cpp]<br>
+!12 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !13, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
+!13 = metadata !{null, metadata !8}<br>
+!14 = metadata !{i32 2, metadata !"Dwarf Version", i32 2}<br>
+!15 = metadata !{i32 786689, metadata !10, metadata !"a", metadata !11, i32 16777219, metadata !8, i32 0, i32 0} ; [ DW_TAG_arg_variable ] [a] [line 3]<br>
+!16 = metadata !{i32 3, i32 0, metadata !10, null}<br>
+!17 = metadata !{i32 786688, metadata !10, metadata !"t", metadata !11, i32 4, metadata !4, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [t] [line 4]<br>
+!18 = metadata !{i32 4, i32 0, metadata !10, null}<br>
+!19 = metadata !{i32 5, i32 0, metadata !10, null}<br>
<br>
Added: llvm/trunk/test/Linker/type-unique-simple-b.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-simple-b.ll?rev=190334&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/type-unique-simple-b.ll?rev=190334&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/Linker/type-unique-simple-b.ll (added)<br>
+++ llvm/trunk/test/Linker/type-unique-simple-b.ll Mon Sep 9 14:47:11 2013<br>
@@ -0,0 +1,68 @@<br>
+; RUN: true<br></blockquote><div><br></div></div></div><div>I don't believe this is the right way to include a dependent file for a test case. I believe (please check for existing examples, etc) is to put the dependent file in an "Inputs" subdirectory, which won't try to be executed as tests themselves.</div>
</div></div></div></blockquote><div>I was following most of the testing cases under test/Linker, and I just noticed that there are a few examples of using Inputs under test/Linker as well.</div><div>Is there a standard way of doing this?</div>
<div><br></div><div>Manman</div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div><div class="h5">
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+<br>
+; ModuleID = 'bar.cpp'<br>
+target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"<br>
+target triple = "x86_64-apple-macosx10.8.0"<br>
+<br>
+%struct.Base = type { i32 }<br>
+<br>
+; Function Attrs: nounwind ssp uwtable<br>
+define void @_Z1gi(i32 %a) #0 {<br>
+entry:<br>
+ %a.addr = alloca i32, align 4<br>
+ %t = alloca %struct.Base, align 4<br>
+ store i32 %a, i32* %a.addr, align 4<br>
+ call void @llvm.dbg.declare(metadata !{i32* %a.addr}, metadata !18), !dbg !19<br>
+ call void @llvm.dbg.declare(metadata !{%struct.Base* %t}, metadata !20), !dbg !21<br>
+ ret void, !dbg !22<br>
+}<br>
+<br>
+; Function Attrs: nounwind readnone<br>
+declare void @llvm.dbg.declare(metadata, metadata) #1<br>
+<br>
+; Function Attrs: ssp uwtable<br>
+define i32 @main() #2 {<br>
+entry:<br>
+ %retval = alloca i32, align 4<br>
+ store i32 0, i32* %retval<br>
+ call void @_Z1fi(i32 0), !dbg !23<br>
+ call void @_Z1gi(i32 1), !dbg !24<br>
+ ret i32 0, !dbg !25<br>
+}<br>
+<br>
+declare void @_Z1fi(i32) #3<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>
+attributes #2 = { 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 #3 = { "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>
+<br>
+!<a href="http://llvm.dbg.cu" target="_blank">llvm.dbg.cu</a> = !{!0}<br>
+!llvm.module.flags = !{!17}<br>
+<br>
+!0 = metadata !{i32 786449, metadata !1, i32 4, metadata !"clang version 3.4 (<a href="http://llvm.org/git/clang.git" target="_blank">http://llvm.org/git/clang.git</a> c23b1db6268c8e7ce64026d57d1510c1aac200a0) (<a href="http://llvm.org/git/llvm.git" target="_blank">http://llvm.org/git/llvm.git</a> 09b98fe3978eddefc2145adc1056cf21580ce945)", i1 false, metadata !"", i32 0, metadata !2, metadata !3, metadata !9, metadata !2, metadata !2, metadata !""} ; [ DW_TAG_compile_unit ] [/Users/mren/c_testing/type_unique_air/simple/bar.cpp] [DW_LANG_C_plus_plus]<br>
+!1 = metadata !{metadata !"bar.cpp", metadata !"/Users/mren/c_testing/type_unique_air/simple"}<br>
+!2 = metadata !{i32 0}<br>
+!3 = metadata !{metadata !4}<br>
+!4 = metadata !{i32 786451, metadata !5, null, metadata !"Base", i32 1, i64 32, i64 32, i32 0, i32 0, null, metadata !6, i32 0, null, null, metadata !"_ZTS4Base"} ; [ DW_TAG_structure_type ] [Base] [line 1, size 32, align 32, offset 0] [def] [from ]<br>
+!5 = metadata !{metadata !"./a.hpp", metadata !"/Users/mren/c_testing/type_unique_air/simple"}<br>
+!6 = metadata !{metadata !7}<br>
+!7 = metadata !{i32 786445, metadata !5, metadata !"_ZTS4Base", metadata !"a", i32 2, i64 32, i64 32, i64 0, i32 0, metadata !8} ; [ DW_TAG_member ] [a] [line 2, size 32, align 32, offset 0] [from int]<br>
+!8 = 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>
+!9 = metadata !{metadata !10, metadata !14}<br>
+!10 = metadata !{i32 786478, metadata !1, metadata !11, metadata !"g", metadata !"g", metadata !"_Z1gi", i32 4, metadata !12, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, void (i32)* @_Z1gi, null, null, metadata !2, i32 4} ; [ DW_TAG_subprogram ] [line 4] [def] [g]<br>
+!11 = metadata !{i32 786473, metadata !1} ; [ DW_TAG_file_type ] [/Users/mren/c_testing/type_unique_air/simple/bar.cpp]<br>
+!12 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !13, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
+!13 = metadata !{null, metadata !8}<br>
+!14 = metadata !{i32 786478, metadata !1, metadata !11, metadata !"main", metadata !"main", metadata !"", i32 7, metadata !15, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, i32 ()* @main, null, null, metadata !2, i32 7} ; [ DW_TAG_subprogram ] [line 7] [def] [main]<br>
+!15 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !16, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]<br>
+!16 = metadata !{metadata !8}<br>
+!17 = metadata !{i32 2, metadata !"Dwarf Version", i32 2}<br>
+!18 = metadata !{i32 786689, metadata !10, metadata !"a", metadata !11, i32 16777220, metadata !8, i32 0, i32 0} ; [ DW_TAG_arg_variable ] [a] [line 4]<br>
+!19 = metadata !{i32 4, i32 0, metadata !10, null}<br>
+!20 = metadata !{i32 786688, metadata !10, metadata !"t", metadata !11, i32 5, metadata !4, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [t] [line 5]<br>
+!21 = metadata !{i32 5, i32 0, metadata !10, null}<br>
+!22 = metadata !{i32 6, i32 0, metadata !10, null}<br>
+!23 = metadata !{i32 8, i32 0, metadata !14, null} ; [ DW_TAG_imported_declaration ]<br>
+!24 = metadata !{i32 9, i32 0, metadata !14, null}<br>
+!25 = metadata !{i32 10, i32 0, metadata !14, null}<br>
<br>
Modified: llvm/trunk/tools/opt/opt.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/opt/opt.cpp?rev=190334&r1=190333&r2=190334&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/opt/opt.cpp?rev=190334&r1=190333&r2=190334&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/opt/opt.cpp (original)<br>
+++ llvm/trunk/tools/opt/opt.cpp Mon Sep 9 14:47:11 2013<br>
@@ -367,6 +367,7 @@ char BasicBlockPassPrinter::ID = 0;<br>
struct BreakpointPrinter : public ModulePass {<br>
raw_ostream &Out;<br>
static char ID;<br>
+ DITypeIdentifierMap TypeIdentifierMap;<br>
<br>
BreakpointPrinter(raw_ostream &out)<br>
: ModulePass(ID), Out(out) {<br>
@@ -382,13 +383,18 @@ struct BreakpointPrinter : public Module<br>
} else if (Context.isType()) {<br>
DIType TY(Context);<br>
if (!TY.getName().empty()) {<br>
- getContextName(TY.getContext(), N);<br>
+ getContextName(TY.getContext().resolve(TypeIdentifierMap), N);<br>
N = N + TY.getName().str() + "::";<br>
}<br>
}<br>
}<br>
<br>
virtual bool runOnModule(Module &M) {<br>
+ TypeIdentifierMap.clear();<br>
+ NamedMDNode *CU_Nodes = M.getNamedMetadata("<a href="http://llvm.dbg.cu" target="_blank">llvm.dbg.cu</a>");<br>
+ if (CU_Nodes)<br>
+ TypeIdentifierMap = generateDITypeIdentifierMap(CU_Nodes);<br>
+<br>
StringSet<> Processed;<br>
if (NamedMDNode *NMD = M.getNamedMetadata("llvm.dbg.sp"))<br>
for (unsigned i = 0, e = NMD->getNumOperands(); i != e; ++i) {<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">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></div></div><br></div></div>
</blockquote></div><br></div></div>