Merge pull request #126 from Teemperor/RemoveExeCtxFromGetUserExprNext

[upstreaming] Remove ExecutionContext from GetUserExpressionForLanguage

Author: Teemperor

lldb/include/lldb/Target/Target.h

@@ -1085,8 +1085,7 @@ class Target : public std::enable_shared_from_this<Target>,
   // Returns a new-ed object which the caller owns.
 
   UserExpression *
-  GetUserExpressionForLanguage(ExecutionContext &exe_ctx,
-                               llvm::StringRef expr, llvm::StringRef prefix,
+  GetUserExpressionForLanguage(llvm::StringRef expr, llvm::StringRef prefix,
                                lldb::LanguageType language,
                                Expression::ResultType desired_type,
                                const EvaluateExpressionOptions &options,

lldb/source/Breakpoint/BreakpointLocation.cpp

@@ -254,9 +254,6 @@ bool BreakpointLocation::ConditionSaysStop(ExecutionContext &exe_ctx,
       language = comp_unit->GetLanguage();
 
     m_user_expression_sp.reset(GetTarget().GetUserExpressionForLanguage(
-        // BEGIN SWIFT
-        exe_ctx,
-        // END SWIFT
         condition_text, llvm::StringRef(), language, Expression::eResultTypeAny,
         EvaluateExpressionOptions(), nullptr, error));
     if (error.Fail()) {

lldb/source/Breakpoint/Watchpoint.cpp

@@ -286,13 +286,7 @@ void Watchpoint::SetCondition(const char *condition) {
   } else {
     // Pass nullptr for expr_prefix (no translation-unit level definitions).
     Status error;
-    // BEGIN SWIFT
-    ExecutionContext exe_scope(m_target);
-    // END SWIFT
     m_condition_up.reset(m_target.GetUserExpressionForLanguage(
-        // BEGIN SWIFT
-        exe_scope,
-        // END SWIFT
         condition, llvm::StringRef(), lldb::eLanguageTypeUnknown,
         UserExpression::eResultTypeAny, EvaluateExpressionOptions(), nullptr,
         error));

lldb/source/Commands/CommandObjectExpression.cpp

@@ -353,9 +353,6 @@ void CommandObjectExpression::HandleCompletion(CompletionRequest &request) {
 
   Status error;
   lldb::UserExpressionSP expr(target->GetUserExpressionForLanguage(
-      // BEGIN SWIFT
-      exe_ctx,
-      // END SWIFT
       code, llvm::StringRef(), language, UserExpression::eResultTypeAny,
       options, nullptr, error));
   if (error.Fail())

lldb/source/Expression/UserExpression.cpp

@@ -230,7 +230,7 @@ lldb::ExpressionResults UserExpression::Evaluate(
   }
 
   lldb::UserExpressionSP user_expression_sp(
-      target->GetUserExpressionForLanguage(exe_ctx, expr, full_prefix, language,
+      target->GetUserExpressionForLanguage(expr, full_prefix, language,
                                            desired_type, options, ctx_obj,
                                            error));
   if (error.Fail()) {
@@ -280,8 +280,7 @@ lldb::ExpressionResults UserExpression::Evaluate(
         user_expression_sp = nullptr;
 
       lldb::UserExpressionSP fixed_expression_sp(
-          target->GetUserExpressionForLanguage(exe_ctx,
-                                               fixed_expression->c_str(),
+          target->GetUserExpressionForLanguage(fixed_expression->c_str(),
                                                full_prefix, language,
                                                desired_type, options, ctx_obj,
                                                error));

lldb/source/Target/Target.cpp

@@ -2318,7 +2318,6 @@ Target::GetSwiftPersistentExpressionState(ExecutionContextScope &exe_scope) {
 }
 
 UserExpression *Target::GetUserExpressionForLanguage(
-    ExecutionContext &exe_ctx,
     llvm::StringRef expr, llvm::StringRef prefix, lldb::LanguageType language,
     Expression::ResultType desired_type,
     const EvaluateExpressionOptions &options, ValueObject *ctx_obj,