Only require thread scope when we're about to run the function on a thread.

llvm-svn: 202740

1 files changed, 6 insertions, 6 deletions

diff --git a/lldb/source/Expression/ClangUserExpression.cpp b/lldb/source/Expression/ClangUserExpression.cpp
index 939f20d0694..887a9d3fbbd 100644
--- a/lldb/source/Expression/ClangUserExpression.cpp
+++ b/lldb/source/Expression/ClangUserExpression.cpp
@@ -763,12 +763,6 @@ ClangUserExpression::Execute (Stream &error_stream,
     // expression, it's quite convenient to have these logs come out with the STEP log as well.
     Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EXPRESSIONS | LIBLLDB_LOG_STEP));
 
-    if (!exe_ctx.HasThreadScope() && !m_can_interpret)
-    {
-        error_stream.Printf("ClangUserExpression::Execute called with no thread selected.");
-        return eExecutionSetupError;
-    }
-        
     if (m_jit_start_addr != LLDB_INVALID_ADDRESS || m_can_interpret)
     {
         lldb::addr_t struct_address = LLDB_INVALID_ADDRESS;
@@ -829,6 +823,12 @@ ClangUserExpression::Execute (Stream &error_stream,
         }
         else
         {
+            if (!exe_ctx.HasThreadScope())
+            {
+                error_stream.Printf("ClangUserExpression::Execute called with no thread selected.");
+                return eExecutionSetupError;
+            }
+                
             Address wrapper_address (m_jit_start_addr);
             
             llvm::SmallVector <lldb::addr_t, 3> args;