From 14f1b3e8826ce43b978db93a62d1166055db5394 Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 2 Jan 2017 19:26:05 +0000
Subject: Vendor import of lldb trunk r290819:
 https://llvm.org/svn/llvm-project/lldb/trunk@290819

---
 source/Core/FileLineResolver.cpp | 126 +++++++++++++++------------------------
 1 file changed, 48 insertions(+), 78 deletions(-)

(limited to 'source/Core/FileLineResolver.cpp')

diff --git a/source/Core/FileLineResolver.cpp b/source/Core/FileLineResolver.cpp
index e8ef87f009d9..db56cae9e9bc 100644
--- a/source/Core/FileLineResolver.cpp
+++ b/source/Core/FileLineResolver.cpp
@@ -21,96 +21,66 @@ using namespace lldb_private;
 //----------------------------------------------------------------------
 // FileLineResolver:
 //----------------------------------------------------------------------
-FileLineResolver::FileLineResolver
-(
-    const FileSpec &file_spec,
-    uint32_t line_no,
-    bool check_inlines
-) :
-    Searcher (),
-    m_file_spec (file_spec),
-    m_line_number (line_no),
-    m_inlines (check_inlines)
-{
-}
+FileLineResolver::FileLineResolver(const FileSpec &file_spec, uint32_t line_no,
+                                   bool check_inlines)
+    : Searcher(), m_file_spec(file_spec), m_line_number(line_no),
+      m_inlines(check_inlines) {}
 
-FileLineResolver::~FileLineResolver ()
-{
-}
+FileLineResolver::~FileLineResolver() {}
 
 Searcher::CallbackReturn
-FileLineResolver::SearchCallback
-(
-    SearchFilter &filter,
-    SymbolContext &context,
-    Address *addr,
-    bool containing
-)
-{
-    CompileUnit *cu = context.comp_unit;
+FileLineResolver::SearchCallback(SearchFilter &filter, SymbolContext &context,
+                                 Address *addr, bool containing) {
+  CompileUnit *cu = context.comp_unit;
 
-    if (m_inlines || m_file_spec.Compare(*cu, m_file_spec, (bool)m_file_spec.GetDirectory()))
-    {
-        uint32_t start_file_idx = 0;
-        uint32_t file_idx = cu->GetSupportFiles().FindFileIndex(start_file_idx, m_file_spec, false);
-        if (file_idx != UINT32_MAX)
-        {
-            LineTable *line_table = cu->GetLineTable();
-            if (line_table)
-            {
-                if (m_line_number == 0)
-                {
-                    // Match all lines in a file...
-                    const bool append = true;
-                    while (file_idx != UINT32_MAX)
-                    {
-                        line_table->FineLineEntriesForFileIndex (file_idx, append, m_sc_list);
-                        // Get the next file index in case we have multiple file 
-                        // entries for the same file
-                        file_idx = cu->GetSupportFiles().FindFileIndex(file_idx + 1, m_file_spec, false);
-                    }
-                }
-                else
-                {
-                    // Match a specific line in a file...
-                }
-            }
+  if (m_inlines ||
+      m_file_spec.Compare(*cu, m_file_spec, (bool)m_file_spec.GetDirectory())) {
+    uint32_t start_file_idx = 0;
+    uint32_t file_idx =
+        cu->GetSupportFiles().FindFileIndex(start_file_idx, m_file_spec, false);
+    if (file_idx != UINT32_MAX) {
+      LineTable *line_table = cu->GetLineTable();
+      if (line_table) {
+        if (m_line_number == 0) {
+          // Match all lines in a file...
+          const bool append = true;
+          while (file_idx != UINT32_MAX) {
+            line_table->FineLineEntriesForFileIndex(file_idx, append,
+                                                    m_sc_list);
+            // Get the next file index in case we have multiple file
+            // entries for the same file
+            file_idx = cu->GetSupportFiles().FindFileIndex(file_idx + 1,
+                                                           m_file_spec, false);
+          }
+        } else {
+          // Match a specific line in a file...
         }
+      }
     }
-    return Searcher::eCallbackReturnContinue;
+  }
+  return Searcher::eCallbackReturnContinue;
 }
 
-Searcher::Depth
-FileLineResolver::GetDepth()
-{
-    return Searcher::eDepthCompUnit;
+Searcher::Depth FileLineResolver::GetDepth() {
+  return Searcher::eDepthCompUnit;
 }
 
-void
-FileLineResolver::GetDescription (Stream *s)
-{
-    s->Printf ("File and line resolver for file: \"%s\" line: %u", 
-               m_file_spec.GetPath().c_str(),
-               m_line_number);
+void FileLineResolver::GetDescription(Stream *s) {
+  s->Printf("File and line resolver for file: \"%s\" line: %u",
+            m_file_spec.GetPath().c_str(), m_line_number);
 }
 
-void
-FileLineResolver::Clear()
-{
-    m_file_spec.Clear();
-    m_line_number = UINT32_MAX;
-    m_sc_list.Clear();
-    m_inlines = true;
+void FileLineResolver::Clear() {
+  m_file_spec.Clear();
+  m_line_number = UINT32_MAX;
+  m_sc_list.Clear();
+  m_inlines = true;
 }
 
-void
-FileLineResolver::Reset (const FileSpec &file_spec,
-                         uint32_t line,
-                         bool check_inlines)
-{
-    m_file_spec = file_spec;
-    m_line_number = line;
-    m_sc_list.Clear();
-    m_inlines = check_inlines;
+void FileLineResolver::Reset(const FileSpec &file_spec, uint32_t line,
+                             bool check_inlines) {
+  m_file_spec = file_spec;
+  m_line_number = line;
+  m_sc_list.Clear();
+  m_inlines = check_inlines;
 }
-
-- 
cgit v1.2.3