diff options
author | Greg Clayton <gclayton@apple.com> | 2010-09-13 04:34:30 +0000 |
---|---|---|
committer | Greg Clayton <gclayton@apple.com> | 2010-09-13 04:34:30 +0000 |
commit | ffc1d6672dc47fcdf82215ac5176e19160796307 (patch) | |
tree | f4e41a2c0cfeb63464a68228f012f7ad48195dd7 /lldb/source/Target/StackFrame.cpp | |
parent | 9df87c1706bdca81d4a7cf6e7c6da67aac67b784 (diff) | |
download | bcm5719-llvm-ffc1d6672dc47fcdf82215ac5176e19160796307.tar.gz bcm5719-llvm-ffc1d6672dc47fcdf82215ac5176e19160796307.zip |
Fixed an assertion that happened when debugging DWARF in .o files with debug
map on macosx.
llvm-svn: 113737
Diffstat (limited to 'lldb/source/Target/StackFrame.cpp')
-rw-r--r-- | lldb/source/Target/StackFrame.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lldb/source/Target/StackFrame.cpp b/lldb/source/Target/StackFrame.cpp index 6d2699d58b1..874f46bc832 100644 --- a/lldb/source/Target/StackFrame.cpp +++ b/lldb/source/Target/StackFrame.cpp @@ -136,14 +136,19 @@ StackFrame::StackFrame 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(); + } + } } |