From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001 From: Kate Stone Date: Tue, 6 Sep 2016 20:57:50 +0000 Subject: =?UTF-8?q?***=20This=20commit=20represents=20a=20complete=20refor?= =?UTF-8?q?matting=20of=20the=20LLDB=20source=20code=20***=20to=20conform?= =?UTF-8?q?=20to=20clang-format=E2=80=99s=20LLVM=20style.=20=20This=20kind?= =?UTF-8?q?=20of=20mass=20change=20has=20***=20two=20obvious=20implication?= =?UTF-8?q?s:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Firstly, merging this particular commit into a downstream fork may be a huge effort. Alternatively, it may be worth merging all changes up to this commit, performing the same reformatting operation locally, and then discarding the merge for this particular commit. The commands used to accomplish this reformatting were as follows (with current working directory as the root of the repository): find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} + find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ; The version of clang-format used was 3.9.0, and autopep8 was 1.2.4. Secondly, “blame” style tools will generally point to this commit instead of a meaningful prior commit. There are alternatives available that will attempt to look through this change and find the appropriate prior commit. YMMV. llvm-svn: 280751 --- .../source/Target/ThreadPlanCallUserExpression.cpp | 130 ++++++++++----------- 1 file changed, 59 insertions(+), 71 deletions(-) (limited to 'lldb/source/Target/ThreadPlanCallUserExpression.cpp') diff --git a/lldb/source/Target/ThreadPlanCallUserExpression.cpp b/lldb/source/Target/ThreadPlanCallUserExpression.cpp index d4259ed..dcd5c8c 100644 --- a/lldb/source/Target/ThreadPlanCallUserExpression.cpp +++ b/lldb/source/Target/ThreadPlanCallUserExpression.cpp @@ -1,4 +1,5 @@ -//===-- ThreadPlanCallUserExpression.cpp ------------------------------*- C++ -*-===// +//===-- ThreadPlanCallUserExpression.cpp ------------------------------*- C++ +//-*-===// // // The LLVM Compiler Infrastructure // @@ -38,91 +39,78 @@ using namespace lldb_private; // ThreadPlanCallUserExpression: Plan to call a single function //---------------------------------------------------------------------- -ThreadPlanCallUserExpression::ThreadPlanCallUserExpression (Thread &thread, - Address &function, - llvm::ArrayRef args, - const EvaluateExpressionOptions &options, - lldb::UserExpressionSP &user_expression_sp) : - ThreadPlanCallFunction (thread, function, CompilerType(), args, options), - m_user_expression_sp (user_expression_sp) -{ - // User expressions are generally "User generated" so we should set them up to stop when done. - SetIsMasterPlan (true); - SetOkayToDiscard(false); +ThreadPlanCallUserExpression::ThreadPlanCallUserExpression( + Thread &thread, Address &function, llvm::ArrayRef args, + const EvaluateExpressionOptions &options, + lldb::UserExpressionSP &user_expression_sp) + : ThreadPlanCallFunction(thread, function, CompilerType(), args, options), + m_user_expression_sp(user_expression_sp) { + // User expressions are generally "User generated" so we should set them up to + // stop when done. + SetIsMasterPlan(true); + SetOkayToDiscard(false); } -ThreadPlanCallUserExpression::~ThreadPlanCallUserExpression () -{ -} +ThreadPlanCallUserExpression::~ThreadPlanCallUserExpression() {} -void -ThreadPlanCallUserExpression::GetDescription (Stream *s, lldb::DescriptionLevel level) -{ - if (level == eDescriptionLevelBrief) - s->Printf("User Expression thread plan"); - else - ThreadPlanCallFunction::GetDescription (s, level); +void ThreadPlanCallUserExpression::GetDescription( + Stream *s, lldb::DescriptionLevel level) { + if (level == eDescriptionLevelBrief) + s->Printf("User Expression thread plan"); + else + ThreadPlanCallFunction::GetDescription(s, level); } -void -ThreadPlanCallUserExpression::WillPop () -{ - ThreadPlanCallFunction::WillPop(); - if (m_user_expression_sp) - m_user_expression_sp.reset(); +void ThreadPlanCallUserExpression::WillPop() { + ThreadPlanCallFunction::WillPop(); + if (m_user_expression_sp) + m_user_expression_sp.reset(); } -bool -ThreadPlanCallUserExpression::MischiefManaged () -{ - Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP)); - - if (IsPlanComplete()) - { - if (log) - log->Printf("ThreadPlanCallFunction(%p): Completed call function plan.", - static_cast(this)); +bool ThreadPlanCallUserExpression::MischiefManaged() { + Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_STEP)); - if (m_manage_materialization && PlanSucceeded() && m_user_expression_sp) - { - lldb::addr_t function_stack_top; - lldb::addr_t function_stack_bottom; - lldb::addr_t function_stack_pointer = GetFunctionStackPointer(); + if (IsPlanComplete()) { + if (log) + log->Printf("ThreadPlanCallFunction(%p): Completed call function plan.", + static_cast(this)); - function_stack_bottom = function_stack_pointer - HostInfo::GetPageSize(); - function_stack_top = function_stack_pointer; + if (m_manage_materialization && PlanSucceeded() && m_user_expression_sp) { + lldb::addr_t function_stack_top; + lldb::addr_t function_stack_bottom; + lldb::addr_t function_stack_pointer = GetFunctionStackPointer(); - DiagnosticManager diagnostics; + function_stack_bottom = function_stack_pointer - HostInfo::GetPageSize(); + function_stack_top = function_stack_pointer; - ExecutionContext exe_ctx(GetThread()); + DiagnosticManager diagnostics; - m_user_expression_sp->FinalizeJITExecution(diagnostics, exe_ctx, m_result_var_sp, function_stack_bottom, - function_stack_top); - } + ExecutionContext exe_ctx(GetThread()); - ThreadPlan::MischiefManaged(); - return true; - } - else - { - return false; + m_user_expression_sp->FinalizeJITExecution( + diagnostics, exe_ctx, m_result_var_sp, function_stack_bottom, + function_stack_top); } + + ThreadPlan::MischiefManaged(); + return true; + } else { + return false; + } } -StopInfoSP -ThreadPlanCallUserExpression::GetRealStopInfo() -{ - StopInfoSP stop_info_sp = ThreadPlanCallFunction::GetRealStopInfo(); - - if (stop_info_sp) - { - lldb::addr_t addr = GetStopAddress(); - DynamicCheckerFunctions *checkers = m_thread.GetProcess()->GetDynamicCheckers(); - StreamString s; - - if (checkers && checkers->DoCheckersExplainStop(addr, s)) - stop_info_sp->SetDescription(s.GetData()); - } +StopInfoSP ThreadPlanCallUserExpression::GetRealStopInfo() { + StopInfoSP stop_info_sp = ThreadPlanCallFunction::GetRealStopInfo(); + + if (stop_info_sp) { + lldb::addr_t addr = GetStopAddress(); + DynamicCheckerFunctions *checkers = + m_thread.GetProcess()->GetDynamicCheckers(); + StreamString s; + + if (checkers && checkers->DoCheckersExplainStop(addr, s)) + stop_info_sp->SetDescription(s.GetData()); + } - return stop_info_sp; + return stop_info_sp; } -- cgit v1.1