[llvm-commits] [llvm] r64943 - in /llvm/branches/Apple/Dib: lib/CodeGen/AsmPrinter/DwarfWriter.cpp test/DebugInfo/2009-02-18-DefaultScope-Crash.ll

[Bill Wendling]

Author: void
Date: Wed Feb 18 13:40:54 2009
New Revision: 64943

URL: http://llvm.org/viewvc/llvm-project?rev=64943&view=rev
Log:
--- Merging r64920 into '.':
A    test/DebugInfo/2009-02-18-DefaultScope-Crash.ll
U    lib/CodeGen/AsmPrinter/DwarfWriter.cpp

The subprogram die may not exist while creating "default" scope.

Added:
    llvm/branches/Apple/Dib/test/DebugInfo/2009-02-18-DefaultScope-Crash.ll
      - copied unchanged from r64920, llvm/trunk/test/DebugInfo/2009-02-18-DefaultScope-Crash.ll
Modified:
    llvm/branches/Apple/Dib/lib/CodeGen/AsmPrinter/DwarfWriter.cpp

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

==============================================================================
--- llvm/branches/Apple/Dib/lib/CodeGen/AsmPrinter/DwarfWriter.cpp (original)
+++ llvm/branches/Apple/Dib/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Wed Feb 18 13:40:54 2009
@@ -2122,7 +2122,10 @@
 
         // Get the subprogram die.
         DIE *SPDie = Unit->getDieMapSlotFor(SPD.getGV());
-        assert(SPDie && "Missing subprogram descriptor");
+        if (!SPDie)
+          /* A subprogram die may not exist if the corresponding function
+             does not have any debug info.  */
+          continue;
 
         // Add the function bounds.
         AddLabel(SPDie, DW_AT_low_pc, DW_FORM_addr,