[llvm-branch-commits] [llvm-branch] r73290 - in /llvm/branches/Apple/Bender: lib/CodeGen/AsmPrinter/DwarfWriter.cpp test/DebugInfo/2009-06-12-InlineFuncStart.ll

[Bill Wendling]

Author: void
Date: Sat Jun 13 02:47:58 2009
New Revision: 73290

URL: http://llvm.org/viewvc/llvm-project?rev=73290&view=rev
Log:
--- Merging r73282 into '.':
A    test/DebugInfo/2009-06-12-InlineFuncStart.ll
M    lib/CodeGen/AsmPrinter/DwarfWriter.cpp


Added:
    llvm/branches/Apple/Bender/test/DebugInfo/2009-06-12-InlineFuncStart.ll
      - copied unchanged from r73282, llvm/trunk/test/DebugInfo/2009-06-12-InlineFuncStart.ll
Modified:
    llvm/branches/Apple/Bender/lib/CodeGen/AsmPrinter/DwarfWriter.cpp

Modified: llvm/branches/Apple/Bender/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Bender/lib/CodeGen/AsmPrinter/DwarfWriter.cpp?rev=73290&r1=73289&r2=73290&view=diff

==============================================================================
--- llvm/branches/Apple/Bender/lib/CodeGen/AsmPrinter/DwarfWriter.cpp (original)
+++ llvm/branches/Apple/Bender/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Sat Jun 13 02:47:58 2009
@@ -3538,7 +3538,11 @@
     DbgScope *Scope = getOrCreateScope(V);
     unsigned ID = MMI->NextLabelID();
     Scope->setEndLabelID(ID);
-    if (LexicalScopeStack.size() != 0)
+    // FIXME : region.end() may not be in the last basic block.
+    // For now, do not pop last lexical scope because next basic
+    // block may start new inlined function's body.
+    unsigned LSSize = LexicalScopeStack.size();
+    if (LSSize != 0 && LSSize != 1)
       LexicalScopeStack.pop_back();
 
     if (TimePassesIsEnabled)