diff options
| author | Johnny Chen <johnny.chen@apple.com> | 2011-09-09 00:01:43 +0000 |
|---|---|---|
| committer | Johnny Chen <johnny.chen@apple.com> | 2011-09-09 00:01:43 +0000 |
| commit | e92aa43b3bc6d6ae1f0d353216a35383b85aabca (patch) | |
| tree | 54fe8e0adbc1ebf44c338fc8d6ced292402d1db9 /lldb/source/Target/Process.cpp | |
| parent | 2592b8720924caf3c7688c9e39a86dd169b4b1b2 (diff) | |
| download | bcm5719-llvm-e92aa43b3bc6d6ae1f0d353216a35383b85aabca.tar.gz bcm5719-llvm-e92aa43b3bc6d6ae1f0d353216a35383b85aabca.zip | |
Patch from Filipe!
One fixes a trailing comma bug (g++ doesn't like them)
The other gets the Error from the result of an expression evaluation and uses it as the error for the Process::LoadImage() method.
llvm-svn: 139336
Diffstat (limited to 'lldb/source/Target/Process.cpp')
| -rw-r--r-- | lldb/source/Target/Process.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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)) |
