From 104a6e9baae960f6b7b32d2b4bdcedec644a3257 Mon Sep 17 00:00:00 2001 From: Sean Callanan Date: Tue, 19 Oct 2010 23:57:21 +0000 Subject: [PATCH] Fixed a silly bug that was causing the "this" pointer to be passed improperly to expressions in certain cases. llvm-svn: 116884 --- lldb/include/lldb/Expression/ClangUserExpression.h | 8 ++++---- lldb/source/Expression/ClangUserExpression.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lldb/include/lldb/Expression/ClangUserExpression.h b/lldb/include/lldb/Expression/ClangUserExpression.h index 8713606cbbde..68ea2beab25d 100644 --- a/lldb/include/lldb/Expression/ClangUserExpression.h +++ b/lldb/include/lldb/Expression/ClangUserExpression.h @@ -95,11 +95,11 @@ public: ThreadPlan * GetThreadPlanToExecuteJITExpression (Stream &error_stream, - ExecutionContext &exe_ctx); + ExecutionContext &exe_ctx); bool FinalizeJITExecution (Stream &error_stream, - ExecutionContext &exe_ctx, - ClangExpressionVariable *&result); + ExecutionContext &exe_ctx, + ClangExpressionVariable *&result); //------------------------------------------------------------------ /// Return the string that the parser should parse. Must be a full @@ -204,7 +204,7 @@ private: PrepareToExecuteJITExpression (Stream &error_stream, ExecutionContext &exe_ctx, lldb::addr_t &struct_address, - lldb::addr_t object_ptr); + lldb::addr_t &object_ptr); std::string m_expr_text; ///< The text of the expression, as typed by the user std::string m_transformed_text; ///< The text of the expression, as send to the parser diff --git a/lldb/source/Expression/ClangUserExpression.cpp b/lldb/source/Expression/ClangUserExpression.cpp index 7a28f97bb1c1..0e454a7cee94 100644 --- a/lldb/source/Expression/ClangUserExpression.cpp +++ b/lldb/source/Expression/ClangUserExpression.cpp @@ -216,9 +216,9 @@ ClangUserExpression::Parse (Stream &error_stream, ExecutionContext &exe_ctx) bool ClangUserExpression::PrepareToExecuteJITExpression (Stream &error_stream, - ExecutionContext &exe_ctx, - lldb::addr_t &struct_address, - lldb::addr_t object_ptr) + ExecutionContext &exe_ctx, + lldb::addr_t &struct_address, + lldb::addr_t &object_ptr) { Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS); -- GitLab