[Lldb-commits] [lldb] r196983 - Fix the test suite after the changes made in revision 196616 exposed issues in the test suite.

[Greg Clayton]

Author: gclayton
Date: Tue Dec 10 17:16:40 2013
New Revision: 196983

URL: http://llvm.org/viewvc/llvm-project?rev=196983&view=rev
Log:
Fix the test suite after the changes made in revision 196616 exposed issues in the test suite.

We must make sure that all ValueObject objects always contain a valid target.


Modified:
    lldb/trunk/source/Core/ValueObject.cpp
    lldb/trunk/source/Expression/ClangUserExpression.cpp

Modified: lldb/trunk/source/Core/ValueObject.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ValueObject.cpp?rev=196983&r1=196982&r2=196983&view=diff
==============================================================================
--- lldb/trunk/source/Core/ValueObject.cpp (original)
+++ lldb/trunk/source/Core/ValueObject.cpp Tue Dec 10 17:16:40 2013
@@ -3516,7 +3516,8 @@ ValueObject::CreateConstantValue (const
     
     if (!valobj_sp)
     {
-        valobj_sp = ValueObjectConstResult::Create (NULL, m_error);
+        ExecutionContext exe_ctx (GetExecutionContextRef());
+        valobj_sp = ValueObjectConstResult::Create (exe_ctx.GetBestExecutionContextScope(), m_error);
     }
     return valobj_sp;
 }

Modified: lldb/trunk/source/Expression/ClangUserExpression.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangUserExpression.cpp?rev=196983&r1=196982&r2=196983&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangUserExpression.cpp (original)
+++ lldb/trunk/source/Expression/ClangUserExpression.cpp Tue Dec 10 17:16:40 2013
@@ -1024,7 +1024,9 @@ ClangUserExpression::Evaluate (Execution
     }
     
     if (result_valobj_sp.get() == NULL)
-        result_valobj_sp = ValueObjectConstResult::Create (NULL, error);
+    {
+        result_valobj_sp = ValueObjectConstResult::Create (exe_ctx.GetBestExecutionContextScope(), error);
+    }
 
     return execution_results;
 }