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/Core/AddressResolverFileLine.cpp | 109 +++++++++++---------------- 1 file changed, 43 insertions(+), 66 deletions(-) (limited to 'lldb/source/Core/AddressResolverFileLine.cpp') diff --git a/lldb/source/Core/AddressResolverFileLine.cpp b/lldb/source/Core/AddressResolverFileLine.cpp index e45076e9bfc..939cf45f3e8 100644 --- a/lldb/source/Core/AddressResolverFileLine.cpp +++ b/lldb/source/Core/AddressResolverFileLine.cpp @@ -21,81 +21,58 @@ using namespace lldb_private; //---------------------------------------------------------------------- // AddressResolverFileLine: //---------------------------------------------------------------------- -AddressResolverFileLine::AddressResolverFileLine -( - const FileSpec &file_spec, - uint32_t line_no, - bool check_inlines -) : - AddressResolver (), - m_file_spec (file_spec), - m_line_number (line_no), - m_inlines (check_inlines) -{ -} +AddressResolverFileLine::AddressResolverFileLine(const FileSpec &file_spec, + uint32_t line_no, + bool check_inlines) + : AddressResolver(), m_file_spec(file_spec), m_line_number(line_no), + m_inlines(check_inlines) {} -AddressResolverFileLine::~AddressResolverFileLine () -{ -} +AddressResolverFileLine::~AddressResolverFileLine() {} Searcher::CallbackReturn -AddressResolverFileLine::SearchCallback -( - SearchFilter &filter, - SymbolContext &context, - Address *addr, - bool containing -) -{ - SymbolContextList sc_list; - uint32_t sc_list_size; - CompileUnit *cu = context.comp_unit; +AddressResolverFileLine::SearchCallback(SearchFilter &filter, + SymbolContext &context, Address *addr, + bool containing) { + SymbolContextList sc_list; + uint32_t sc_list_size; + CompileUnit *cu = context.comp_unit; - Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS)); + Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_BREAKPOINTS)); - sc_list_size = cu->ResolveSymbolContext (m_file_spec, m_line_number, m_inlines, false, eSymbolContextEverything, - sc_list); - for (uint32_t i = 0; i < sc_list_size; i++) - { - SymbolContext sc; - if (sc_list.GetContextAtIndex(i, sc)) - { - Address line_start = sc.line_entry.range.GetBaseAddress(); - addr_t byte_size = sc.line_entry.range.GetByteSize(); - if (line_start.IsValid()) - { - AddressRange new_range (line_start, byte_size); - m_address_ranges.push_back (new_range); - if (log) - { - StreamString s; - //new_bp_loc->GetDescription (&s, lldb::eDescriptionLevelVerbose); - //log->Printf ("Added address: %s\n", s.GetData()); - } - } - else - { - if (log) - log->Printf ("error: Unable to resolve address at file address 0x%" PRIx64 " for %s:%d\n", - line_start.GetFileAddress(), - m_file_spec.GetFilename().AsCString(""), - m_line_number); - } + sc_list_size = + cu->ResolveSymbolContext(m_file_spec, m_line_number, m_inlines, false, + eSymbolContextEverything, sc_list); + for (uint32_t i = 0; i < sc_list_size; i++) { + SymbolContext sc; + if (sc_list.GetContextAtIndex(i, sc)) { + Address line_start = sc.line_entry.range.GetBaseAddress(); + addr_t byte_size = sc.line_entry.range.GetByteSize(); + if (line_start.IsValid()) { + AddressRange new_range(line_start, byte_size); + m_address_ranges.push_back(new_range); + if (log) { + StreamString s; + // new_bp_loc->GetDescription (&s, lldb::eDescriptionLevelVerbose); + // log->Printf ("Added address: %s\n", s.GetData()); } + } else { + if (log) + log->Printf( + "error: Unable to resolve address at file address 0x%" PRIx64 + " for %s:%d\n", + line_start.GetFileAddress(), + m_file_spec.GetFilename().AsCString(""), m_line_number); + } } - return Searcher::eCallbackReturnContinue; + } + return Searcher::eCallbackReturnContinue; } -Searcher::Depth -AddressResolverFileLine::GetDepth() -{ - return Searcher::eDepthCompUnit; +Searcher::Depth AddressResolverFileLine::GetDepth() { + return Searcher::eDepthCompUnit; } -void -AddressResolverFileLine::GetDescription (Stream *s) -{ - s->Printf ("File and line address - file: \"%s\" line: %u", m_file_spec.GetFilename().AsCString(""), m_line_number); +void AddressResolverFileLine::GetDescription(Stream *s) { + s->Printf("File and line address - file: \"%s\" line: %u", + m_file_spec.GetFilename().AsCString(""), m_line_number); } - - -- cgit v1.2.3