diff options
| -rw-r--r-- | lldb/include/lldb/Expression/UserExpression.h | 6 | ||||
| -rw-r--r-- | lldb/source/Expression/REPL.cpp | 1 | ||||
| -rw-r--r-- | lldb/source/Expression/UserExpression.cpp | 2 | ||||
| -rw-r--r-- | lldb/source/Target/Target.cpp | 11 |
4 files changed, 7 insertions, 13 deletions
diff --git a/lldb/include/lldb/Expression/UserExpression.h b/lldb/include/lldb/Expression/UserExpression.h index ea72c51b518..9954f020b3f 100644 --- a/lldb/include/lldb/Expression/UserExpression.h +++ b/lldb/include/lldb/Expression/UserExpression.h @@ -261,10 +261,6 @@ public: /// Filled in with an error in case the expression evaluation /// fails to parse, run, or evaluated. /// - /// @param[in] line_offset - /// The offset of the first line of the expression from the "beginning" of - /// a virtual source file used for error reporting and debug info. - /// /// @param[out] fixed_expression /// If non-nullptr, the fixed expression is copied into the provided /// string. @@ -290,7 +286,7 @@ public: Evaluate(ExecutionContext &exe_ctx, const EvaluateExpressionOptions &options, llvm::StringRef expr_cstr, llvm::StringRef expr_prefix, lldb::ValueObjectSP &result_valobj_sp, Status &error, - uint32_t line_offset = 0, std::string *fixed_expression = nullptr, + std::string *fixed_expression = nullptr, lldb::ModuleSP *jit_module_sp_ptr = nullptr, ValueObject *ctx_obj = nullptr); diff --git a/lldb/source/Expression/REPL.cpp b/lldb/source/Expression/REPL.cpp index 4136146cb48..8bc74e4ebdd 100644 --- a/lldb/source/Expression/REPL.cpp +++ b/lldb/source/Expression/REPL.cpp @@ -307,7 +307,6 @@ void REPL::IOHandlerInputComplete(IOHandler &io_handler, std::string &code) { lldb::ExpressionResults execution_results = UserExpression::Evaluate(exe_ctx, expr_options, code.c_str(), expr_prefix, result_valobj_sp, error, - 0, // Line offset nullptr, // Fixed Expression &jit_module_sp); diff --git a/lldb/source/Expression/UserExpression.cpp b/lldb/source/Expression/UserExpression.cpp index 4fb56177d98..997ac9efe3c 100644 --- a/lldb/source/Expression/UserExpression.cpp +++ b/lldb/source/Expression/UserExpression.cpp @@ -139,7 +139,7 @@ lldb::addr_t UserExpression::GetObjectPointer(lldb::StackFrameSP frame_sp, lldb::ExpressionResults UserExpression::Evaluate( ExecutionContext &exe_ctx, const EvaluateExpressionOptions &options, llvm::StringRef expr, llvm::StringRef prefix, - lldb::ValueObjectSP &result_valobj_sp, Status &error, uint32_t line_offset, + lldb::ValueObjectSP &result_valobj_sp, Status &error, std::string *fixed_expression, lldb::ModuleSP *jit_module_sp_ptr, ValueObject *ctx_obj) { Log *log(lldb_private::GetLogIfAnyCategoriesSet(LIBLLDB_LOG_EXPRESSIONS | diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp index a60ec516280..046e878df9e 100644 --- a/lldb/source/Target/Target.cpp +++ b/lldb/source/Target/Target.cpp @@ -2401,12 +2401,11 @@ ExpressionResults Target::EvaluateExpression( } else { llvm::StringRef prefix = GetExpressionPrefixContents(); Status error; - execution_results = UserExpression::Evaluate(exe_ctx, options, expr, prefix, - result_valobj_sp, error, - 0, // Line Number - fixed_expression, - nullptr, // Module - ctx_obj); + execution_results = + UserExpression::Evaluate(exe_ctx, options, expr, prefix, + result_valobj_sp, error, fixed_expression, + nullptr, // Module + ctx_obj); } m_suppress_stop_hooks = old_suppress_value; |
