Added extra logging, and made sure that the argument

struct for expressions is deallocated when the
ClangExpressionDeclMap is taken down.

llvm-svn: 116028

1 files changed, 9 insertions, 0 deletions

diff --git a/lldb/source/Expression/ClangExpressionDeclMap.cpp b/lldb/source/Expression/ClangExpressionDeclMap.cpp
index 8937571014f..6d72ed2488d 100644
--- a/lldb/source/Expression/ClangExpressionDeclMap.cpp
+++ b/lldb/source/Expression/ClangExpressionDeclMap.cpp
@@ -74,6 +74,12 @@ ClangExpressionDeclMap::~ClangExpressionDeclMap()
         pvar.DisableParserVars();
     }
     
+    if (m_materialized_location)
+    {
+        m_exe_ctx->process->DeallocateMemory(m_materialized_location);
+        m_materialized_location = 0;
+    }
+    
     if (m_sym_ctx)
         delete m_sym_ctx;
 }
@@ -495,6 +501,9 @@ ClangExpressionDeclMap::DoMaterialize (bool dematerialize,
             m_materialized_location = 0;
         }
         
+        if (log)
+            log->PutCString("Allocating memory for materialized argument struct");
+        
         lldb::addr_t mem = exe_ctx->process->AllocateMemory(m_struct_alignment + m_struct_size, 
                                                             lldb::ePermissionsReadable | lldb::ePermissionsWritable,
                                                             err);