From 8fff19ba556b8a61545fa52fdac9f04fbbe74e11 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Mon, 1 Jun 2009 20:18:46 +0000 Subject: Accidental commit. This isn't ready for prime time just yet. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@72699 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/CodeGen/AsmPrinter/DwarfDebug.cpp') diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index 6b6d3b3c91..25217b0880 100644 --- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -969,6 +969,12 @@ DbgScope *DwarfDebug::getOrCreateScope(GlobalVariable *V) { DbgScope *Parent = NULL; DIBlock Block(V); + // Don't create a new scope if we already created one for an inlined function. + DenseMap::iterator + II = AbstractInstanceRootMap.find(V); + if (II != AbstractInstanceRootMap.end()) + return LexicalScopeStack.back(); + if (!Block.isNull()) { DIDescriptor ParentDesc = Block.getContext(); Parent = @@ -1024,8 +1030,6 @@ void DwarfDebug::ConstructDbgScope(DbgScope *ParentScope, AddLabel(Die, dwarf::DW_AT_high_pc, dwarf::DW_FORM_addr, DWLabel("func_end", SubprogramCount)); - // Add the scope's contents. - ConstructDbgScope(ConcreteInst, StartID, EndID, Die, Unit); ParentDie->AddChild(Die); } -- cgit v1.2.3-70-g09d2