[Lldb-commits] [lldb] r113737 - /lldb/trunk/source/Target/StackFrame.cpp

Greg Clayton gclayton at apple.com
Sun Sep 12 21:34:30 PDT 2010


Author: gclayton
Date: Sun Sep 12 23:34:30 2010
New Revision: 113737

URL: http://llvm.org/viewvc/llvm-project?rev=113737&view=rev
Log:
Fixed an assertion that happened when debugging DWARF in .o files with debug
map on macosx.


Modified:
    lldb/trunk/source/Target/StackFrame.cpp

Modified: lldb/trunk/source/Target/StackFrame.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/StackFrame.cpp?rev=113737&r1=113736&r2=113737&view=diff
==============================================================================
--- lldb/trunk/source/Target/StackFrame.cpp (original)
+++ lldb/trunk/source/Target/StackFrame.cpp Sun Sep 12 23:34:30 2010
@@ -136,14 +136,19 @@
         m_flags.Set (eSymbolContextTarget);
     }
     
-    if (m_sc.module_sp.get() == NULL && pc_addr.GetSection())
+    Module *pc_module = pc_addr.GetModule();
+    if (m_sc.module_sp.get() == NULL || m_sc.module_sp.get() != pc_module)
     {
-        Module *pc_module = pc_addr.GetSection()->GetModule();
         if (pc_module)
         {
             m_sc.module_sp = pc_module->GetSP();
             m_flags.Set (eSymbolContextModule);
         }
+        else
+        {
+            m_sc.module_sp.reset();
+        }
+
     }
 }
 





More information about the lldb-commits mailing list