Added functionality to dematerialize values that were

used by the JIT compiled expression, including the
result of the expression.

Also added a new class, ASTType, which encapsulates an
opaque Clang type and its associated AST context.

Refactored ClangExpressionDeclMap to use ASTTypes,
significantly reducing the possibility of mixups of
types from different AST contexts.

llvm-svn: 108965

1 files changed, 2 insertions, 3 deletions

diff --git a/lldb/source/Commands/CommandObjectExpression.cpp b/lldb/source/Commands/CommandObjectExpression.cpp
index e3f2baab51a..637d3dcd52a 100644
--- a/lldb/source/Commands/CommandObjectExpression.cpp
+++ b/lldb/source/Commands/CommandObjectExpression.cpp
@@ -305,10 +305,9 @@ CommandObjectExpression::EvaluateExpression (const char *expr, bool bare, Stream
             }
             
             Error err;
-                        
-            lldb::addr_t struct_address = expr_decl_map.Materialize(&m_exe_ctx, err);
+            lldb::addr_t struct_address;
             
-            if (struct_address == LLDB_INVALID_ADDRESS)
+            if (!expr_decl_map.Materialize(&m_exe_ctx, struct_address, err))
             {
                 error_stream.Printf ("Couldn't materialize struct: %s\n", err.AsCString("unknown error"));
                 return false;