aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2013-05-22 21:24:36 +0000
committerBill Wendling <isanbard@gmail.com>2013-05-22 21:24:36 +0000
commit443d96c703164ee66ce532c6da9d9f205d8b6fdd (patch)
treebd9d07f05891f3e4126266a3800e724ced08645d
parentfd633af7f6e5b58d512898fd59866b86962a2a06 (diff)
downloadllvm-443d96c703164ee66ce532c6da9d9f205d8b6fdd.zip
llvm-443d96c703164ee66ce532c6da9d9f205d8b6fdd.tar.gz
llvm-443d96c703164ee66ce532c6da9d9f205d8b6fdd.tar.bz2
Merging r182437:
------------------------------------------------------------------------ r182437 | gclayton | 2013-05-21 16:36:34 -0700 (Tue, 21 May 2013) | 5 lines <rdar://problem/13455021> lldb crashes with universal file containing skinny BSD archives when doing DWARF with .o file debugging. ------------------------------------------------------------------------ llvm-svn: 182521
-rw-r--r--lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
index 109e429..fdd6186 100644
--- a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
+++ b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
@@ -457,7 +457,7 @@ ObjectContainerBSDArchive::GetObjectFile (const FileSpec *file)
module_sp->GetObjectModificationTime());
if (object)
{
- lldb::offset_t data_offset = m_offset + object->ar_file_offset;
+ lldb::offset_t data_offset = object->ar_file_offset;
return ObjectFile::FindPlugin (module_sp,
file,
m_offset + object->ar_file_offset,