From 866dcdacfe59f5f448e008fe2c4cb9dfcf72b2ec Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 18 Feb 2014 16:23:10 +0000
Subject: Import lldb as of SVN r201577 (git 2bdc2f6)

(A number of files not required for the FreeBSD build have been removed.)

Sponsored by:	DARPA, AFRL
---
 source/Expression/ClangUserExpression.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source/Expression/ClangUserExpression.cpp')

diff --git a/source/Expression/ClangUserExpression.cpp b/source/Expression/ClangUserExpression.cpp
index d9ecd41be97a4..6b0eee8cf3630 100644
--- a/source/Expression/ClangUserExpression.cpp
+++ b/source/Expression/ClangUserExpression.cpp
@@ -1024,7 +1024,9 @@ ClangUserExpression::Evaluate (ExecutionContext &exe_ctx,
     }
     
     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;
 }
-- 
cgit v1.2.3