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 --- lldb/source/Expression/UtilityFunction.cpp | 138 +++++++++++++---------------- 1 file changed, 64 insertions(+), 74 deletions(-) (limited to 'lldb/source/Expression/UtilityFunction.cpp') diff --git a/lldb/source/Expression/UtilityFunction.cpp b/lldb/source/Expression/UtilityFunction.cpp index 2ff77f0..f279509 100644 --- a/lldb/source/Expression/UtilityFunction.cpp +++ b/lldb/source/Expression/UtilityFunction.cpp @@ -1,4 +1,5 @@ -//===-- ClangUserExpression.cpp -------------------------------------*- C++ -*-===// +//===-- ClangUserExpression.cpp -------------------------------------*- C++ +//-*-===// // // The LLVM Compiler Infrastructure // @@ -10,7 +11,7 @@ // C Includes #include #if HAVE_SYS_TYPES_H -# include +#include #endif // C++ Includes @@ -42,85 +43,74 @@ using namespace lldb; /// @param[in] name /// The name of the function, as used in the text. //------------------------------------------------------------------ -UtilityFunction::UtilityFunction (ExecutionContextScope &exe_scope, - const char *text, - const char *name) : - Expression (exe_scope), - m_execution_unit_sp (), - m_jit_module_wp (), - m_function_text (ExpressionSourceCode::g_expression_prefix), - m_function_name (name) -{ - if (text && text[0]) - m_function_text.append (text); +UtilityFunction::UtilityFunction(ExecutionContextScope &exe_scope, + const char *text, const char *name) + : Expression(exe_scope), m_execution_unit_sp(), m_jit_module_wp(), + m_function_text(ExpressionSourceCode::g_expression_prefix), + m_function_name(name) { + if (text && text[0]) + m_function_text.append(text); } -UtilityFunction::~UtilityFunction () -{ - lldb::ProcessSP process_sp (m_jit_process_wp.lock()); - if (process_sp) - { - lldb::ModuleSP jit_module_sp (m_jit_module_wp.lock()); - if (jit_module_sp) - process_sp->GetTarget().GetImages().Remove(jit_module_sp); - } - +UtilityFunction::~UtilityFunction() { + lldb::ProcessSP process_sp(m_jit_process_wp.lock()); + if (process_sp) { + lldb::ModuleSP jit_module_sp(m_jit_module_wp.lock()); + if (jit_module_sp) + process_sp->GetTarget().GetImages().Remove(jit_module_sp); + } } -// FIXME: We should check that every time this is called it is called with the same return type & arguments... +// FIXME: We should check that every time this is called it is called with the +// same return type & arguments... -FunctionCaller * -UtilityFunction::MakeFunctionCaller (const CompilerType &return_type, const ValueList &arg_value_list, lldb::ThreadSP thread_to_use_sp, Error &error) -{ - if (m_caller_up) - return m_caller_up.get(); - - ProcessSP process_sp = m_jit_process_wp.lock(); - if (!process_sp) - { - error.SetErrorString("Can't make a function caller without a process."); - return nullptr; - } - - Address impl_code_address; - impl_code_address.SetOffset(StartAddress()); - std::string name(m_function_name); - name.append("-caller"); - - m_caller_up.reset (process_sp->GetTarget().GetFunctionCallerForLanguage (Language(), - return_type, - impl_code_address, - arg_value_list, - name.c_str(), - error)); - if (error.Fail()) - { - - return nullptr; - } - if (m_caller_up) - { - DiagnosticManager diagnostics; +FunctionCaller *UtilityFunction::MakeFunctionCaller( + const CompilerType &return_type, const ValueList &arg_value_list, + lldb::ThreadSP thread_to_use_sp, Error &error) { + if (m_caller_up) + return m_caller_up.get(); + + ProcessSP process_sp = m_jit_process_wp.lock(); + if (!process_sp) { + error.SetErrorString("Can't make a function caller without a process."); + return nullptr; + } - unsigned num_errors = m_caller_up->CompileFunction(thread_to_use_sp, diagnostics); - if (num_errors) - { - error.SetErrorStringWithFormat("Error compiling %s caller function: \"%s\".", m_function_name.c_str(), - diagnostics.GetString().c_str()); - m_caller_up.reset(); - return nullptr; - } + Address impl_code_address; + impl_code_address.SetOffset(StartAddress()); + std::string name(m_function_name); + name.append("-caller"); - diagnostics.Clear(); - ExecutionContext exe_ctx(process_sp); + m_caller_up.reset(process_sp->GetTarget().GetFunctionCallerForLanguage( + Language(), return_type, impl_code_address, arg_value_list, name.c_str(), + error)); + if (error.Fail()) { - if (!m_caller_up->WriteFunctionWrapper(exe_ctx, diagnostics)) - { - error.SetErrorStringWithFormat("Error inserting caller function for %s: \"%s\".", m_function_name.c_str(), - diagnostics.GetString().c_str()); - m_caller_up.reset(); - return nullptr; - } + return nullptr; + } + if (m_caller_up) { + DiagnosticManager diagnostics; + + unsigned num_errors = + m_caller_up->CompileFunction(thread_to_use_sp, diagnostics); + if (num_errors) { + error.SetErrorStringWithFormat( + "Error compiling %s caller function: \"%s\".", + m_function_name.c_str(), diagnostics.GetString().c_str()); + m_caller_up.reset(); + return nullptr; } - return m_caller_up.get(); + + diagnostics.Clear(); + ExecutionContext exe_ctx(process_sp); + + if (!m_caller_up->WriteFunctionWrapper(exe_ctx, diagnostics)) { + error.SetErrorStringWithFormat( + "Error inserting caller function for %s: \"%s\".", + m_function_name.c_str(), diagnostics.GetString().c_str()); + m_caller_up.reset(); + return nullptr; + } + } + return m_caller_up.get(); } -- cgit v1.1