[Lldb-commits] [lldb] r139336 - in /lldb/trunk/source: Plugins/SymbolFile/DWARF/SymbolFileDWARF.h Target/Process.cpp

[Johnny Chen]

Author: johnny
Date: Thu Sep  8 19:01:43 2011
New Revision: 139336

URL: http://llvm.org/viewvc/llvm-project?rev=139336&view=rev
Log:
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.

Modified:
    lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
    lldb/trunk/source/Target/Process.cpp

Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h?rev=139336&r1=139335&r2=139336&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h Thu Sep  8 19:01:43 2011
@@ -234,7 +234,7 @@
         flagsGotDebugRangesData     = (1 << 9),
         flagsGotDebugStrData        = (1 << 10),
         flagsGotDebugNamesData      = (1 << 11),
-        flagsGotDebugTypesData      = (1 << 12),
+        flagsGotDebugTypesData      = (1 << 12)
     };
 
     DISALLOW_COPY_AND_ASSIGN (SymbolFileDWARF);

Modified: lldb/trunk/source/Target/Process.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Process.cpp?rev=139336&r1=139335&r2=139336&view=diff
==============================================================================
--- lldb/trunk/source/Target/Process.cpp (original)
+++ lldb/trunk/source/Target/Process.cpp Thu Sep  8 19:01:43 2011
@@ -1155,7 +1155,8 @@
                 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))