[Lldb-commits] [lldb] r155474 - in /lldb/branches/lldb-platform-work: ./ source/Expression/IRForTarget.cpp

[Johnny Chen]

Author: johnny
Date: Tue Apr 24 14:44:08 2012
New Revision: 155474

URL: http://llvm.org/viewvc/llvm-project?rev=155474&view=rev
Log:
Merge r155455 from ToT:

svn merge -r 155423:155455 https://johnny@llvm.org/svn/llvm-project/lldb/trunk .

Modified:
    lldb/branches/lldb-platform-work/   (props changed)
    lldb/branches/lldb-platform-work/source/Expression/IRForTarget.cpp

Propchange: lldb/branches/lldb-platform-work/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 24 14:44:08 2012
@@ -1 +1 @@
-/lldb/trunk:154224-155423
+/lldb/trunk:154224-155455

Modified: lldb/branches/lldb-platform-work/source/Expression/IRForTarget.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/lldb-platform-work/source/Expression/IRForTarget.cpp?rev=155474&r1=155473&r2=155474&view=diff
==============================================================================
--- lldb/branches/lldb-platform-work/source/Expression/IRForTarget.cpp (original)
+++ lldb/branches/lldb-platform-work/source/Expression/IRForTarget.cpp Tue Apr 24 14:44:08 2012
@@ -2676,7 +2676,8 @@
     }
     
     if (m_execution_policy == lldb_private::eExecutionPolicyNever) {
-        m_decl_map->RemoveResultVariable(m_result_name);
+        if (m_result_name)
+            m_decl_map->RemoveResultVariable(m_result_name);
         return false;
     }