[Lldb-commits] [lldb] r116884 - in /lldb/trunk: include/lldb/Expression/ClangUserExpression.h source/Expression/ClangUserExpression.cpp

[Sean Callanan]

Author: spyffe
Date: Tue Oct 19 18:57:21 2010
New Revision: 116884

URL: http://llvm.org/viewvc/llvm-project?rev=116884&view=rev
Log:
Fixed a silly bug that was causing the "this" pointer
to be passed improperly to expressions in certain
cases.

Modified:
    lldb/trunk/include/lldb/Expression/ClangUserExpression.h
    lldb/trunk/source/Expression/ClangUserExpression.cpp

Modified: lldb/trunk/include/lldb/Expression/ClangUserExpression.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Expression/ClangUserExpression.h?rev=116884&r1=116883&r2=116884&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Expression/ClangUserExpression.h (original)
+++ lldb/trunk/include/lldb/Expression/ClangUserExpression.h Tue Oct 19 18:57:21 2010
@@ -95,11 +95,11 @@
              
     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 @@
     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

Modified: lldb/trunk/source/Expression/ClangUserExpression.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangUserExpression.cpp?rev=116884&r1=116883&r2=116884&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangUserExpression.cpp (original)
+++ lldb/trunk/source/Expression/ClangUserExpression.cpp Tue Oct 19 18:57:21 2010
@@ -216,9 +216,9 @@
 
 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);