From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001 From: Kate Stone Date: Tue, 6 Sep 2016 20:57:50 +0000 Subject: *** This commit represents a complete reformatting of the LLDB source code *** to conform to clang-format’s LLVM style. This kind of mass change has *** two obvious implications: 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/API/SBBlock.cpp | 526 ++++++++++++++++++-------------------------- 1 file changed, 218 insertions(+), 308 deletions(-) (limited to 'lldb/source/API/SBBlock.cpp') diff --git a/lldb/source/API/SBBlock.cpp b/lldb/source/API/SBBlock.cpp index 03ee7343c9f..471b7fbebb2 100644 --- a/lldb/source/API/SBBlock.cpp +++ b/lldb/source/API/SBBlock.cpp @@ -26,362 +26,272 @@ using namespace lldb; using namespace lldb_private; +SBBlock::SBBlock() : m_opaque_ptr(NULL) {} -SBBlock::SBBlock () : - m_opaque_ptr (NULL) -{ -} +SBBlock::SBBlock(lldb_private::Block *lldb_object_ptr) + : m_opaque_ptr(lldb_object_ptr) {} -SBBlock::SBBlock (lldb_private::Block *lldb_object_ptr) : - m_opaque_ptr (lldb_object_ptr) -{ -} +SBBlock::SBBlock(const SBBlock &rhs) : m_opaque_ptr(rhs.m_opaque_ptr) {} -SBBlock::SBBlock(const SBBlock &rhs) : - m_opaque_ptr (rhs.m_opaque_ptr) -{ +const SBBlock &SBBlock::operator=(const SBBlock &rhs) { + m_opaque_ptr = rhs.m_opaque_ptr; + return *this; } -const SBBlock & -SBBlock::operator = (const SBBlock &rhs) -{ - m_opaque_ptr = rhs.m_opaque_ptr; - return *this; -} +SBBlock::~SBBlock() { m_opaque_ptr = NULL; } -SBBlock::~SBBlock () -{ - m_opaque_ptr = NULL; -} +bool SBBlock::IsValid() const { return m_opaque_ptr != NULL; } -bool -SBBlock::IsValid () const -{ - return m_opaque_ptr != NULL; +bool SBBlock::IsInlined() const { + if (m_opaque_ptr) + return m_opaque_ptr->GetInlinedFunctionInfo() != NULL; + return false; } -bool -SBBlock::IsInlined () const -{ - if (m_opaque_ptr) - return m_opaque_ptr->GetInlinedFunctionInfo () != NULL; - return false; -} - -const char * -SBBlock::GetInlinedName () const -{ - if (m_opaque_ptr) - { - const InlineFunctionInfo* inlined_info = m_opaque_ptr->GetInlinedFunctionInfo (); - if (inlined_info) - { - Function *function = m_opaque_ptr->CalculateSymbolContextFunction(); - LanguageType language; - if (function) - language = function->GetLanguage(); - else - language = lldb::eLanguageTypeUnknown; - return inlined_info->GetName(language).AsCString (NULL); - } +const char *SBBlock::GetInlinedName() const { + if (m_opaque_ptr) { + const InlineFunctionInfo *inlined_info = + m_opaque_ptr->GetInlinedFunctionInfo(); + if (inlined_info) { + Function *function = m_opaque_ptr->CalculateSymbolContextFunction(); + LanguageType language; + if (function) + language = function->GetLanguage(); + else + language = lldb::eLanguageTypeUnknown; + return inlined_info->GetName(language).AsCString(NULL); } - return NULL; + } + return NULL; } -SBFileSpec -SBBlock::GetInlinedCallSiteFile () const -{ - SBFileSpec sb_file; - if (m_opaque_ptr) - { - const InlineFunctionInfo* inlined_info = m_opaque_ptr->GetInlinedFunctionInfo (); - if (inlined_info) - sb_file.SetFileSpec (inlined_info->GetCallSite().GetFile()); - } - return sb_file; +SBFileSpec SBBlock::GetInlinedCallSiteFile() const { + SBFileSpec sb_file; + if (m_opaque_ptr) { + const InlineFunctionInfo *inlined_info = + m_opaque_ptr->GetInlinedFunctionInfo(); + if (inlined_info) + sb_file.SetFileSpec(inlined_info->GetCallSite().GetFile()); + } + return sb_file; } -uint32_t -SBBlock::GetInlinedCallSiteLine () const -{ - if (m_opaque_ptr) - { - const InlineFunctionInfo* inlined_info = m_opaque_ptr->GetInlinedFunctionInfo (); - if (inlined_info) - return inlined_info->GetCallSite().GetLine(); - } - return 0; +uint32_t SBBlock::GetInlinedCallSiteLine() const { + if (m_opaque_ptr) { + const InlineFunctionInfo *inlined_info = + m_opaque_ptr->GetInlinedFunctionInfo(); + if (inlined_info) + return inlined_info->GetCallSite().GetLine(); + } + return 0; } -uint32_t -SBBlock::GetInlinedCallSiteColumn () const -{ - if (m_opaque_ptr) - { - const InlineFunctionInfo* inlined_info = m_opaque_ptr->GetInlinedFunctionInfo (); - if (inlined_info) - return inlined_info->GetCallSite().GetColumn(); - } - return 0; +uint32_t SBBlock::GetInlinedCallSiteColumn() const { + if (m_opaque_ptr) { + const InlineFunctionInfo *inlined_info = + m_opaque_ptr->GetInlinedFunctionInfo(); + if (inlined_info) + return inlined_info->GetCallSite().GetColumn(); + } + return 0; } -void -SBBlock::AppendVariables (bool can_create, bool get_parent_variables, lldb_private::VariableList *var_list) -{ - if (IsValid()) - { - bool show_inline = true; - m_opaque_ptr->AppendVariables (can_create, - get_parent_variables, - show_inline, - [](Variable*) { return true; }, - var_list); - } +void SBBlock::AppendVariables(bool can_create, bool get_parent_variables, + lldb_private::VariableList *var_list) { + if (IsValid()) { + bool show_inline = true; + m_opaque_ptr->AppendVariables(can_create, get_parent_variables, show_inline, + [](Variable *) { return true; }, var_list); + } } -SBBlock -SBBlock::GetParent () -{ - SBBlock sb_block; - if (m_opaque_ptr) - sb_block.m_opaque_ptr = m_opaque_ptr->GetParent(); - return sb_block; +SBBlock SBBlock::GetParent() { + SBBlock sb_block; + if (m_opaque_ptr) + sb_block.m_opaque_ptr = m_opaque_ptr->GetParent(); + return sb_block; } -lldb::SBBlock -SBBlock::GetContainingInlinedBlock () -{ - SBBlock sb_block; - if (m_opaque_ptr) - sb_block.m_opaque_ptr = m_opaque_ptr->GetContainingInlinedBlock (); - return sb_block; +lldb::SBBlock SBBlock::GetContainingInlinedBlock() { + SBBlock sb_block; + if (m_opaque_ptr) + sb_block.m_opaque_ptr = m_opaque_ptr->GetContainingInlinedBlock(); + return sb_block; } -SBBlock -SBBlock::GetSibling () -{ - SBBlock sb_block; - if (m_opaque_ptr) - sb_block.m_opaque_ptr = m_opaque_ptr->GetSibling(); - return sb_block; +SBBlock SBBlock::GetSibling() { + SBBlock sb_block; + if (m_opaque_ptr) + sb_block.m_opaque_ptr = m_opaque_ptr->GetSibling(); + return sb_block; } -SBBlock -SBBlock::GetFirstChild () -{ - SBBlock sb_block; - if (m_opaque_ptr) - sb_block.m_opaque_ptr = m_opaque_ptr->GetFirstChild(); - return sb_block; +SBBlock SBBlock::GetFirstChild() { + SBBlock sb_block; + if (m_opaque_ptr) + sb_block.m_opaque_ptr = m_opaque_ptr->GetFirstChild(); + return sb_block; } -lldb_private::Block * -SBBlock::GetPtr () -{ - return m_opaque_ptr; -} +lldb_private::Block *SBBlock::GetPtr() { return m_opaque_ptr; } -void -SBBlock::SetPtr (lldb_private::Block *block) -{ - m_opaque_ptr = block; -} +void SBBlock::SetPtr(lldb_private::Block *block) { m_opaque_ptr = block; } -bool -SBBlock::GetDescription (SBStream &description) -{ - Stream &strm = description.ref(); - - if (m_opaque_ptr) - { - lldb::user_id_t id = m_opaque_ptr->GetID(); - strm.Printf ("Block: {id: %" PRIu64 "} ", id); - if (IsInlined()) - { - strm.Printf (" (inlined, '%s') ", GetInlinedName()); - } - lldb_private::SymbolContext sc; - m_opaque_ptr->CalculateSymbolContext (&sc); - if (sc.function) - { - m_opaque_ptr->DumpAddressRanges (&strm, - sc.function->GetAddressRange().GetBaseAddress().GetFileAddress()); - } +bool SBBlock::GetDescription(SBStream &description) { + Stream &strm = description.ref(); + + if (m_opaque_ptr) { + lldb::user_id_t id = m_opaque_ptr->GetID(); + strm.Printf("Block: {id: %" PRIu64 "} ", id); + if (IsInlined()) { + strm.Printf(" (inlined, '%s') ", GetInlinedName()); } - else - strm.PutCString ("No value"); - - return true; + lldb_private::SymbolContext sc; + m_opaque_ptr->CalculateSymbolContext(&sc); + if (sc.function) { + m_opaque_ptr->DumpAddressRanges( + &strm, + sc.function->GetAddressRange().GetBaseAddress().GetFileAddress()); + } + } else + strm.PutCString("No value"); + + return true; } -uint32_t -SBBlock::GetNumRanges () -{ - if (m_opaque_ptr) - return m_opaque_ptr->GetNumRanges(); - return 0; +uint32_t SBBlock::GetNumRanges() { + if (m_opaque_ptr) + return m_opaque_ptr->GetNumRanges(); + return 0; } -lldb::SBAddress -SBBlock::GetRangeStartAddress (uint32_t idx) -{ - lldb::SBAddress sb_addr; - if (m_opaque_ptr) - { - AddressRange range; - if (m_opaque_ptr->GetRangeAtIndex(idx, range)) - { - sb_addr.ref() = range.GetBaseAddress(); - } +lldb::SBAddress SBBlock::GetRangeStartAddress(uint32_t idx) { + lldb::SBAddress sb_addr; + if (m_opaque_ptr) { + AddressRange range; + if (m_opaque_ptr->GetRangeAtIndex(idx, range)) { + sb_addr.ref() = range.GetBaseAddress(); } - return sb_addr; + } + return sb_addr; } -lldb::SBAddress -SBBlock::GetRangeEndAddress (uint32_t idx) -{ - lldb::SBAddress sb_addr; - if (m_opaque_ptr) - { - AddressRange range; - if (m_opaque_ptr->GetRangeAtIndex(idx, range)) - { - sb_addr.ref() = range.GetBaseAddress(); - sb_addr.ref().Slide(range.GetByteSize()); - } +lldb::SBAddress SBBlock::GetRangeEndAddress(uint32_t idx) { + lldb::SBAddress sb_addr; + if (m_opaque_ptr) { + AddressRange range; + if (m_opaque_ptr->GetRangeAtIndex(idx, range)) { + sb_addr.ref() = range.GetBaseAddress(); + sb_addr.ref().Slide(range.GetByteSize()); } - return sb_addr; + } + return sb_addr; } -uint32_t -SBBlock::GetRangeIndexForBlockAddress (lldb::SBAddress block_addr) -{ - if (m_opaque_ptr && block_addr.IsValid()) - { - return m_opaque_ptr->GetRangeIndexContainingAddress (block_addr.ref()); - } +uint32_t SBBlock::GetRangeIndexForBlockAddress(lldb::SBAddress block_addr) { + if (m_opaque_ptr && block_addr.IsValid()) { + return m_opaque_ptr->GetRangeIndexContainingAddress(block_addr.ref()); + } - return UINT32_MAX; + return UINT32_MAX; } - -lldb::SBValueList -SBBlock::GetVariables (lldb::SBFrame& frame, - bool arguments, - bool locals, - bool statics, - lldb::DynamicValueType use_dynamic) -{ - Block *block = GetPtr(); - SBValueList value_list; - if (block) - { - StackFrameSP frame_sp(frame.GetFrameSP()); - VariableListSP variable_list_sp (block->GetBlockVariableList (true)); - - if (variable_list_sp) - { - const size_t num_variables = variable_list_sp->GetSize(); - if (num_variables) - { - for (size_t i = 0; i < num_variables; ++i) - { - VariableSP variable_sp (variable_list_sp->GetVariableAtIndex(i)); - if (variable_sp) - { - bool add_variable = false; - switch (variable_sp->GetScope()) - { - case eValueTypeVariableGlobal: - case eValueTypeVariableStatic: - case eValueTypeVariableThreadLocal: - add_variable = statics; - break; - - case eValueTypeVariableArgument: - add_variable = arguments; - break; - - case eValueTypeVariableLocal: - add_variable = locals; - break; - - default: - break; - } - if (add_variable) - { - if (frame_sp) - { - lldb::ValueObjectSP valobj_sp(frame_sp->GetValueObjectForFrameVariable (variable_sp,eNoDynamicValues)); - SBValue value_sb; - value_sb.SetSP(valobj_sp, use_dynamic); - value_list.Append (value_sb); - } - } - } - } +lldb::SBValueList SBBlock::GetVariables(lldb::SBFrame &frame, bool arguments, + bool locals, bool statics, + lldb::DynamicValueType use_dynamic) { + Block *block = GetPtr(); + SBValueList value_list; + if (block) { + StackFrameSP frame_sp(frame.GetFrameSP()); + VariableListSP variable_list_sp(block->GetBlockVariableList(true)); + + if (variable_list_sp) { + const size_t num_variables = variable_list_sp->GetSize(); + if (num_variables) { + for (size_t i = 0; i < num_variables; ++i) { + VariableSP variable_sp(variable_list_sp->GetVariableAtIndex(i)); + if (variable_sp) { + bool add_variable = false; + switch (variable_sp->GetScope()) { + case eValueTypeVariableGlobal: + case eValueTypeVariableStatic: + case eValueTypeVariableThreadLocal: + add_variable = statics; + break; + + case eValueTypeVariableArgument: + add_variable = arguments; + break; + + case eValueTypeVariableLocal: + add_variable = locals; + break; + + default: + break; + } + if (add_variable) { + if (frame_sp) { + lldb::ValueObjectSP valobj_sp( + frame_sp->GetValueObjectForFrameVariable(variable_sp, + eNoDynamicValues)); + SBValue value_sb; + value_sb.SetSP(valobj_sp, use_dynamic); + value_list.Append(value_sb); + } } - } + } + } + } } - return value_list; + } + return value_list; } -lldb::SBValueList -SBBlock::GetVariables (lldb::SBTarget& target, - bool arguments, - bool locals, - bool statics) -{ - Block *block = GetPtr(); - - SBValueList value_list; - if (block) - { - TargetSP target_sp(target.GetSP()); - - VariableListSP variable_list_sp (block->GetBlockVariableList (true)); - - if (variable_list_sp) - { - const size_t num_variables = variable_list_sp->GetSize(); - if (num_variables) - { - for (size_t i = 0; i < num_variables; ++i) - { - VariableSP variable_sp (variable_list_sp->GetVariableAtIndex(i)); - if (variable_sp) - { - bool add_variable = false; - switch (variable_sp->GetScope()) - { - case eValueTypeVariableGlobal: - case eValueTypeVariableStatic: - case eValueTypeVariableThreadLocal: - add_variable = statics; - break; - - case eValueTypeVariableArgument: - add_variable = arguments; - break; - - case eValueTypeVariableLocal: - add_variable = locals; - break; - - default: - break; - } - if (add_variable) - { - if (target_sp) - value_list.Append (ValueObjectVariable::Create (target_sp.get(), variable_sp)); - } - } - } +lldb::SBValueList SBBlock::GetVariables(lldb::SBTarget &target, bool arguments, + bool locals, bool statics) { + Block *block = GetPtr(); + + SBValueList value_list; + if (block) { + TargetSP target_sp(target.GetSP()); + + VariableListSP variable_list_sp(block->GetBlockVariableList(true)); + + if (variable_list_sp) { + const size_t num_variables = variable_list_sp->GetSize(); + if (num_variables) { + for (size_t i = 0; i < num_variables; ++i) { + VariableSP variable_sp(variable_list_sp->GetVariableAtIndex(i)); + if (variable_sp) { + bool add_variable = false; + switch (variable_sp->GetScope()) { + case eValueTypeVariableGlobal: + case eValueTypeVariableStatic: + case eValueTypeVariableThreadLocal: + add_variable = statics; + break; + + case eValueTypeVariableArgument: + add_variable = arguments; + break; + + case eValueTypeVariableLocal: + add_variable = locals; + break; + + default: + break; } + if (add_variable) { + if (target_sp) + value_list.Append( + ValueObjectVariable::Create(target_sp.get(), variable_sp)); + } + } } - } - return value_list; + } + } + } + return value_list; } - -- cgit v1.2.3