commit 841026fc8d1cc22bd3b9e74623b413a3e6aa9d38
author Sean Callanan <scallanan@apple.com> Fri Jul 23 00:16:21 2010 +0000
committer Sean Callanan <scallanan@apple.com> Fri Jul 23 00:16:21 2010 +0000
tree 931199786104e3b975c1f9d947555a1fa5d342ca
parent c607d8681f443d03806f105ceceb11dcadd16184

Modified TaggedASTType to inherit from ClangASTType
and moved it to its own header file for cleanliness.

Added more logging to ClangFunction so that we can
diagnose crashes in the executing expression.

Added code to extract the result of the expression
from the struct that is passed to the JIT-compiled
code.


git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@109199 91177308-0d34-0410-b5e6-96231b3b80d8

source/Expression/ClangExpressionDeclMap.cpp

diff --git a/source/Expression/ClangExpressionDeclMap.cpp b/source/Expression/ClangExpressionDeclMap.cpp
index 54bfad5..1a9e57f 100644
--- a/source/Expression/ClangExpressionDeclMap.cpp
+++ b/source/Expression/ClangExpressionDeclMap.cpp
@@ -295,8 +295,10 @@
                                                                    iter->m_parser_type.GetOpaqueQualType()),
                                          context);
                 
-                result_value->SetContext(Value::eContextTypeOpaqueClangQualType, 
-                                         copied_type.GetOpaqueQualType());
+                result_value->SetContext(Value::eContextTypeOpaqueClangQualType, copied_type.GetOpaqueQualType());
+                
+                result_value->SetValueType(Value::eValueTypeLoadAddress);
+                result_value->GetScalar() = (uintptr_t)m_materialized_location + iter->m_offset;
             }
             
             continue;
@@ -330,10 +332,8 @@
         return false;
     }
     
-    log->Printf("%s %s with type %p", 
-                (dematerialize ? "Dematerializing" : "Materializing"), 
-                name, 
-                type.GetOpaqueQualType());
+    if (log)
+        log->Printf("%s %s with type %p", (dematerialize ? "Dematerializing" : "Materializing"), name, type.GetOpaqueQualType());
     
     std::auto_ptr<lldb_private::Value> location_value(GetVariableValue(exe_ctx,
                                                                        var,
@@ -349,8 +349,7 @@
     {
         lldb::addr_t value_addr = location_value->GetScalar().ULongLong();
         
-        size_t bit_size = ClangASTContext::GetTypeBitSize (type.GetASTContext(), 
-                                                           type.GetOpaqueQualType());
+        size_t bit_size = ClangASTContext::GetTypeBitSize(type.GetASTContext(), type.GetOpaqueQualType());
         size_t byte_size = bit_size % 8 ? ((bit_size + 8) / 8) : (bit_size / 8);
         
         DataBufferHeap data;
@@ -493,9 +492,7 @@
         
         if (type->GetASTContext() == var->GetType()->GetClangAST())
         {
-            if (!ClangASTContext::AreTypesSame(type->GetASTContext(), 
-                                               type->GetOpaqueQualType(), 
-                                               var->GetType()->GetOpaqueClangQualType()))
+            if (!ClangASTContext::AreTypesSame(type->GetASTContext(), type->GetOpaqueQualType(), var->GetType()->GetOpaqueClangQualType()))
                 return NULL;
         }
         else