diff options
-rw-r--r-- | lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h | 2 | ||||
-rw-r--r-- | lldb/source/Target/Process.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h index 16f36aae4bf..2c596bf3b09 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h @@ -234,7 +234,7 @@ protected: flagsGotDebugRangesData = (1 << 9), flagsGotDebugStrData = (1 << 10), flagsGotDebugNamesData = (1 << 11), - flagsGotDebugTypesData = (1 << 12), + flagsGotDebugTypesData = (1 << 12) }; DISALLOW_COPY_AND_ASSIGN (SymbolFileDWARF); diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp index 8f57d1cded0..52fd8578a46 100644 --- a/lldb/source/Target/Process.cpp +++ b/lldb/source/Target/Process.cpp @@ -1155,7 +1155,8 @@ Process::LoadImage (const FileSpec &image_spec, Error &error) const char *prefix = "extern \"C\" void* dlopen (const char *path, int mode);\n"; lldb::ValueObjectSP result_valobj_sp; ClangUserExpression::Evaluate (exe_ctx, unwind_on_error, expr.GetData(), prefix, result_valobj_sp); - if (result_valobj_sp->GetError().Success()) + error = result_valobj_sp->GetError(); + if (error.Success()) { Scalar scalar; if (result_valobj_sp->ResolveValue (scalar)) |