From 95afbf517afc7d8bee70cfde65cfc4fa0093956d Mon Sep 17 00:00:00 2001 From: Jim Ingham Date: Fri, 7 Dec 2012 19:04:31 +0000 Subject: [PATCH] Now that we set ThreadPlanCallFunction to private in the constructor, it is confusing that we set it again in client code after creating the plans. So remove those unnecessary calls. llvm-svn: 169625 --- lldb/source/Expression/ClangFunction.cpp | 4 +--- lldb/source/Expression/ClangUserExpression.cpp | 4 +--- .../AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lldb/source/Expression/ClangFunction.cpp b/lldb/source/Expression/ClangFunction.cpp index 988bad5..bab93f0 100644 --- a/lldb/source/Expression/ClangFunction.cpp +++ b/lldb/source/Expression/ClangFunction.cpp @@ -517,9 +517,7 @@ ClangFunction::ExecuteFunction ( this_arg)); if (!call_plan_sp) return eExecutionSetupError; - - call_plan_sp->SetPrivate(true); - + // we need to make sure we record the fact that we are running an expression here // otherwise this fact will fail to be recorded when fetching an Objective-C object description if (exe_ctx.GetProcessPtr()) diff --git a/lldb/source/Expression/ClangUserExpression.cpp b/lldb/source/Expression/ClangUserExpression.cpp index 13b7b0e..81db328 100644 --- a/lldb/source/Expression/ClangUserExpression.cpp +++ b/lldb/source/Expression/ClangUserExpression.cpp @@ -633,9 +633,7 @@ ClangUserExpression::Execute (Stream &error_stream, return eExecutionSetupError; lldb::addr_t function_stack_pointer = static_cast(call_plan_sp.get())->GetFunctionStackPointer(); - - call_plan_sp->SetPrivate(true); - + if (log) log->Printf("-- [ClangUserExpression::Execute] Execution of expression begins --"); diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp index 3b778e8..18667d6 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleThreadPlanStepThroughObjCTrampoline.cpp @@ -86,7 +86,6 @@ AppleThreadPlanStepThroughObjCTrampoline::InitializeClangFunction () ExecutionContext exc_ctx; m_thread.CalculateExecutionContext(exc_ctx); m_func_sp.reset(m_impl_function->GetThreadPlanToCallFunction (exc_ctx, m_args_addr, errors, m_stop_others)); - m_func_sp->SetPrivate(true); m_func_sp->SetOkayToDiscard(true); m_thread.QueueThreadPlan (m_func_sp, false); } -- 2.7.4