Update clang, llvm, lld, lldb, compiler-rt and libc++ to 4.0.0 release:

MFC r309142 (by emaste):

Add WITH_LLD_AS_LD build knob

If set it installs LLD as /usr/bin/ld.  LLD (as of version 3.9) is not
capable of linking the world and kernel, but can self-host and link many
substantial applications. GNU ld continues to be used for the world and
kernel build, regardless of how this knob is set.

It is on by default for arm64, and off for all other CPU architectures.

Sponsored by:	The FreeBSD Foundation

MFC r310840:

Reapply 310775, now it also builds correctly if lldb is disabled:

Move llvm-objdump from CLANG_EXTRAS to installed by default

We currently install three tools from binutils 2.17.50: as, ld, and
objdump. Work is underway to migrate to a permissively-licensed
tool-chain, with one goal being the retirement of binutils 2.17.50.

LLVM's llvm-objdump is intended to be compatible with GNU objdump
although it is currently missing some options and may have formatting
differences. Enable it by default for testing and further investigation.
It may later be changed to install as /usr/bin/objdump, it becomes a
fully viable replacement.

Reviewed by:	emaste
Differential Revision:	https://reviews.freebsd.org/D8879

MFC r312855 (by emaste):

Rename LLD_AS_LD to LLD_IS_LD, for consistency with CLANG_IS_CC

Reported by:	Dan McGregor <dan.mcgregor usask.ca>

MFC r313559 | glebius | 2017-02-10 18:34:48 +0100 (Fri, 10 Feb 2017) | 5 lines

Don't check struct rtentry on FreeBSD, it is an internal kernel structure.
On other systems it may be API structure for SIOCADDRT/SIOCDELRT.

Reviewed by:	emaste, dim

MFC r314152 (by jkim):

Remove an assembler flag, which is redundant since r309124.  The upstream
took care of it by introducing a macro NO_EXEC_STACK_DIRECTIVE.

http://llvm.org/viewvc/llvm-project?rev=273500&view=rev

Reviewed by:	dim

MFC r314564:

Upgrade our copies of clang, llvm, lld, lldb, compiler-rt and libc++ to
4.0.0 (branches/release_40 296509).  The release will follow soon.

Please note that from 3.5.0 onwards, clang, llvm and lldb require C++11
support to build; see UPDATING for more information.

Also note that as of 4.0.0, lld should be able to link the base system
on amd64 and aarch64.  See the WITH_LLD_IS_LLD setting in src.conf(5).
Though please be aware that this is work in progress.

Release notes for llvm, clang and lld will be available here:
<http://releases.llvm.org/4.0.0/docs/ReleaseNotes.html>
<http://releases.llvm.org/4.0.0/tools/clang/docs/ReleaseNotes.html>
<http://releases.llvm.org/4.0.0/tools/lld/docs/ReleaseNotes.html>

Thanks to Ed Maste, Jan Beich, Antoine Brodin and Eric Fiselier for
their help.

Relnotes:	yes
Exp-run:	antoine
PR:		215969, 216008

MFC r314708:

For now, revert r287232 from upstream llvm trunk (by Daniil Fukalov):

  [SCEV] limit recursion depth of CompareSCEVComplexity

  Summary:
  CompareSCEVComplexity goes too deep (50+ on a quite a big unrolled
  loop) and runs almost infinite time.

  Added cache of "equal" SCEV pairs to earlier cutoff of further
  estimation. Recursion depth limit was also introduced as a parameter.

  Reviewers: sanjoy

  Subscribers: mzolotukhin, tstellarAMD, llvm-commits

  Differential Revision: https://reviews.llvm.org/D26389

This commit is the cause of excessive compile times on skein_block.c
(and possibly other files) during kernel builds on amd64.

We never saw the problematic behavior described in this upstream commit,
so for now it is better to revert it.  An upstream bug has been filed
here: https://bugs.llvm.org/show_bug.cgi?id=32142

Reported by:	mjg

MFC r314795:

Reapply r287232 from upstream llvm trunk (by Daniil Fukalov):

  [SCEV] limit recursion depth of CompareSCEVComplexity

  Summary:
  CompareSCEVComplexity goes too deep (50+ on a quite a big unrolled
  loop) and runs almost infinite time.

  Added cache of "equal" SCEV pairs to earlier cutoff of further
  estimation. Recursion depth limit was also introduced as a parameter.

  Reviewers: sanjoy

  Subscribers: mzolotukhin, tstellarAMD, llvm-commits

  Differential Revision: https://reviews.llvm.org/D26389

Pull in r296992 from upstream llvm trunk (by Sanjoy Das):

  [SCEV] Decrease the recursion threshold for CompareValueComplexity

  Fixes PR32142.

  r287232 accidentally increased the recursion threshold for
  CompareValueComplexity from 2 to 32.  This change reverses that
  change by introducing a separate flag for CompareValueComplexity's
  threshold.

The latter revision fixes the excessive compile times for skein_block.c.

MFC r314907 | mmel | 2017-03-08 12:40:27 +0100 (Wed, 08 Mar 2017) | 7 lines

Unbreak ARMv6 world.

The new compiler_rt library imported with clang 4.0.0 have several fatal
issues (non-functional __udivsi3 for example) with ARM specific instrict
functions. As temporary workaround, until upstream solve these problems,
disable all thumb[1][2] related feature.

MFC r315016:

Update clang, llvm, lld, lldb, compiler-rt and libc++ to 4.0.0 release.
We were already very close to the last release candidate, so this is a
pretty minor update.

Relnotes:	yes

MFC r316005:

Revert r314907, and pull in r298713 from upstream compiler-rt trunk (by
Weiming Zhao):

  builtins: Select correct code fragments when compiling for Thumb1/Thum2/ARM ISA.

  Summary:
  Value of __ARM_ARCH_ISA_THUMB isn't based on the actual compilation
  mode (-mthumb, -marm), it reflect's capability of given CPU.

  Due to this:
   - use  __tbumb__ and __thumb2__ insteand of __ARM_ARCH_ISA_THUMB
   - use '.thumb' directive consistently  in all affected files
   - decorate all thumb functions using
     DEFINE_COMPILERRT_THUMB_FUNCTION()

  ---------
  Note: This patch doesn't fix broken Thumb1 variant of __udivsi3 !

  Reviewers: weimingz, rengolin, compnerd

  Subscribers: aemerson, dim

  Differential Revision: https://reviews.llvm.org/D30938

Discussed with:	mmel

1 files changed, 200 insertions, 231 deletions

diff --git a/contrib/llvm/tools/lldb/source/Target/SectionLoadList.cpp b/contrib/llvm/tools/lldb/source/Target/SectionLoadList.cpp
index 1235a37..a3599dd 100644
--- a/contrib/llvm/tools/lldb/source/Target/SectionLoadList.cpp
+++ b/contrib/llvm/tools/lldb/source/Target/SectionLoadList.cpp
@@ -24,275 +24,244 @@
 using namespace lldb;
 using namespace lldb_private;
 
-SectionLoadList::SectionLoadList(const SectionLoadList &rhs) : m_addr_to_sect(), m_sect_to_addr(), m_mutex()
-{
-    std::lock_guard<std::recursive_mutex> guard(rhs.m_mutex);
-    m_addr_to_sect = rhs.m_addr_to_sect;
-    m_sect_to_addr = rhs.m_sect_to_addr;
+SectionLoadList::SectionLoadList(const SectionLoadList &rhs)
+    : m_addr_to_sect(), m_sect_to_addr(), m_mutex() {
+  std::lock_guard<std::recursive_mutex> guard(rhs.m_mutex);
+  m_addr_to_sect = rhs.m_addr_to_sect;
+  m_sect_to_addr = rhs.m_sect_to_addr;
 }
 
-void
-SectionLoadList::operator=(const SectionLoadList &rhs)
-{
-    std::lock_guard<std::recursive_mutex> lhs_guard(m_mutex);
-    std::lock_guard<std::recursive_mutex> rhs_guard(rhs.m_mutex);
-    m_addr_to_sect = rhs.m_addr_to_sect;
-    m_sect_to_addr = rhs.m_sect_to_addr;
+void SectionLoadList::operator=(const SectionLoadList &rhs) {
+  std::lock_guard<std::recursive_mutex> lhs_guard(m_mutex);
+  std::lock_guard<std::recursive_mutex> rhs_guard(rhs.m_mutex);
+  m_addr_to_sect = rhs.m_addr_to_sect;
+  m_sect_to_addr = rhs.m_sect_to_addr;
 }
 
-bool
-SectionLoadList::IsEmpty() const
-{
-    std::lock_guard<std::recursive_mutex> guard(m_mutex);
-    return m_addr_to_sect.empty();
+bool SectionLoadList::IsEmpty() const {
+  std::lock_guard<std::recursive_mutex> guard(m_mutex);
+  return m_addr_to_sect.empty();
 }
 
-void
-SectionLoadList::Clear ()
-{
-    std::lock_guard<std::recursive_mutex> guard(m_mutex);
-    m_addr_to_sect.clear();
-    m_sect_to_addr.clear();
+void SectionLoadList::Clear() {
+  std::lock_guard<std::recursive_mutex> guard(m_mutex);
+  m_addr_to_sect.clear();
+  m_sect_to_addr.clear();
 }
 
 addr_t
-SectionLoadList::GetSectionLoadAddress (const lldb::SectionSP &section) const
-{
-    // TODO: add support for the same section having multiple load addresses
-    addr_t section_load_addr = LLDB_INVALID_ADDRESS;
-    if (section)
-    {
-        std::lock_guard<std::recursive_mutex> guard(m_mutex);
-        sect_to_addr_collection::const_iterator pos = m_sect_to_addr.find (section.get());
-        
-        if (pos != m_sect_to_addr.end())
-            section_load_addr = pos->second;
-    }
-    return section_load_addr;
+SectionLoadList::GetSectionLoadAddress(const lldb::SectionSP &section) const {
+  // TODO: add support for the same section having multiple load addresses
+  addr_t section_load_addr = LLDB_INVALID_ADDRESS;
+  if (section) {
+    std::lock_guard<std::recursive_mutex> guard(m_mutex);
+    sect_to_addr_collection::const_iterator pos =
+        m_sect_to_addr.find(section.get());
+
+    if (pos != m_sect_to_addr.end())
+      section_load_addr = pos->second;
+  }
+  return section_load_addr;
 }
 
-bool
-SectionLoadList::SetSectionLoadAddress (const lldb::SectionSP &section, addr_t load_addr, bool warn_multiple)
-{
-    Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER | LIBLLDB_LOG_VERBOSE));
+bool SectionLoadList::SetSectionLoadAddress(const lldb::SectionSP &section,
+                                            addr_t load_addr,
+                                            bool warn_multiple) {
+  Log *log(lldb_private::GetLogIfAnyCategoriesSet(LIBLLDB_LOG_DYNAMIC_LOADER |
+                                                  LIBLLDB_LOG_VERBOSE));
 
-    ModuleSP module_sp (section->GetModule());
+  ModuleSP module_sp(section->GetModule());
 
-    if (module_sp)
-    {
-        if (log)
-        {
-            const FileSpec &module_file_spec (module_sp->GetFileSpec());
-            log->Printf ("SectionLoadList::%s (section = %p (%s.%s), load_addr = 0x%16.16" PRIx64 ") module = %p",
-                         __FUNCTION__, static_cast<void*>(section.get()),
-                         module_file_spec.GetPath().c_str(),
-                         section->GetName().AsCString(), load_addr,
-                         static_cast<void*>(module_sp.get()));
-        }
+  if (module_sp) {
+    if (log) {
+      const FileSpec &module_file_spec(module_sp->GetFileSpec());
+      log->Printf("SectionLoadList::%s (section = %p (%s.%s), load_addr = "
+                  "0x%16.16" PRIx64 ") module = %p",
+                  __FUNCTION__, static_cast<void *>(section.get()),
+                  module_file_spec.GetPath().c_str(),
+                  section->GetName().AsCString(), load_addr,
+                  static_cast<void *>(module_sp.get()));
+    }
 
-        if (section->GetByteSize() == 0)
-            return false; // No change
+    if (section->GetByteSize() == 0)
+      return false; // No change
 
-        // Fill in the section -> load_addr map
-        std::lock_guard<std::recursive_mutex> guard(m_mutex);
-        sect_to_addr_collection::iterator sta_pos = m_sect_to_addr.find(section.get());
-        if (sta_pos != m_sect_to_addr.end())
-        {
-            if (load_addr == sta_pos->second)
-                return false; // No change...
-            else
-                sta_pos->second = load_addr;
-        }
-        else
-            m_sect_to_addr[section.get()] = load_addr;
+    // Fill in the section -> load_addr map
+    std::lock_guard<std::recursive_mutex> guard(m_mutex);
+    sect_to_addr_collection::iterator sta_pos =
+        m_sect_to_addr.find(section.get());
+    if (sta_pos != m_sect_to_addr.end()) {
+      if (load_addr == sta_pos->second)
+        return false; // No change...
+      else
+        sta_pos->second = load_addr;
+    } else
+      m_sect_to_addr[section.get()] = load_addr;
 
-        // Fill in the load_addr -> section map
-        addr_to_sect_collection::iterator ats_pos = m_addr_to_sect.find(load_addr);
-        if (ats_pos != m_addr_to_sect.end())
-        {
-            // Some sections are ok to overlap, and for others we should warn. When
-            // we have multiple load addresses that correspond to a section, we will
-            // always attribute the section to the be last section that claims it
-            // exists at that address. Sometimes it is ok for more that one section
-            // to be loaded at a specific load address, and other times it isn't.
-            // The "warn_multiple" parameter tells us if we should warn in this case
-            // or not. The DynamicLoader plug-in subclasses should know which
-            // sections should warn and which shouldn't (darwin shared cache modules
-            // all shared the same "__LINKEDIT" sections, so the dynamic loader can
-            // pass false for "warn_multiple").
-            if (warn_multiple && section != ats_pos->second)
-            {
-                ModuleSP module_sp (section->GetModule());
-                if (module_sp)
-                {
-                    ModuleSP curr_module_sp (ats_pos->second->GetModule());
-                    if (curr_module_sp)
-                    {
-                        module_sp->ReportWarning ("address 0x%16.16" PRIx64 " maps to more than one section: %s.%s and %s.%s",
-                                                  load_addr, 
-                                                  module_sp->GetFileSpec().GetFilename().GetCString(), 
-                                                  section->GetName().GetCString(),
-                                                  curr_module_sp->GetFileSpec().GetFilename().GetCString(),
-                                                  ats_pos->second->GetName().GetCString());
-                    }
-                }
-            }
-            ats_pos->second = section;
+    // Fill in the load_addr -> section map
+    addr_to_sect_collection::iterator ats_pos = m_addr_to_sect.find(load_addr);
+    if (ats_pos != m_addr_to_sect.end()) {
+      // Some sections are ok to overlap, and for others we should warn. When
+      // we have multiple load addresses that correspond to a section, we will
+      // always attribute the section to the be last section that claims it
+      // exists at that address. Sometimes it is ok for more that one section
+      // to be loaded at a specific load address, and other times it isn't.
+      // The "warn_multiple" parameter tells us if we should warn in this case
+      // or not. The DynamicLoader plug-in subclasses should know which
+      // sections should warn and which shouldn't (darwin shared cache modules
+      // all shared the same "__LINKEDIT" sections, so the dynamic loader can
+      // pass false for "warn_multiple").
+      if (warn_multiple && section != ats_pos->second) {
+        ModuleSP module_sp(section->GetModule());
+        if (module_sp) {
+          ModuleSP curr_module_sp(ats_pos->second->GetModule());
+          if (curr_module_sp) {
+            module_sp->ReportWarning(
+                "address 0x%16.16" PRIx64
+                " maps to more than one section: %s.%s and %s.%s",
+                load_addr, module_sp->GetFileSpec().GetFilename().GetCString(),
+                section->GetName().GetCString(),
+                curr_module_sp->GetFileSpec().GetFilename().GetCString(),
+                ats_pos->second->GetName().GetCString());
+          }
         }
-        else
-            m_addr_to_sect[load_addr] = section;
-        return true;    // Changed
+      }
+      ats_pos->second = section;
+    } else
+      m_addr_to_sect[load_addr] = section;
+    return true; // Changed
 
+  } else {
+    if (log) {
+      log->Printf(
+          "SectionLoadList::%s (section = %p (%s), load_addr = 0x%16.16" PRIx64
+          ") error: module has been deleted",
+          __FUNCTION__, static_cast<void *>(section.get()),
+          section->GetName().AsCString(), load_addr);
     }
-    else
-    {
-        if (log)
-        {
-            log->Printf ("SectionLoadList::%s (section = %p (%s), load_addr = 0x%16.16" PRIx64 ") error: module has been deleted",
-                         __FUNCTION__, static_cast<void*>(section.get()),
-                         section->GetName().AsCString(),
-                         load_addr);
-        }
-    }
-    return false;
+  }
+  return false;
 }
 
-size_t
-SectionLoadList::SetSectionUnloaded (const lldb::SectionSP &section_sp)
-{
-    size_t unload_count = 0;
+size_t SectionLoadList::SetSectionUnloaded(const lldb::SectionSP &section_sp) {
+  size_t unload_count = 0;
 
-    if (section_sp)
-    {
-        Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER | LIBLLDB_LOG_VERBOSE));
+  if (section_sp) {
+    Log *log(lldb_private::GetLogIfAnyCategoriesSet(LIBLLDB_LOG_DYNAMIC_LOADER |
+                                                    LIBLLDB_LOG_VERBOSE));
 
-        if (log)
-        {
-            ModuleSP module_sp = section_sp->GetModule();
-            std::string module_name("<Unknown>");
-            if (module_sp)
-            {
-                const FileSpec &module_file_spec (section_sp->GetModule()->GetFileSpec());
-                module_name = module_file_spec.GetPath();
-            }
-            log->Printf ("SectionLoadList::%s (section = %p (%s.%s))",
-                         __FUNCTION__, static_cast<void*>(section_sp.get()),
-                         module_name.c_str(),
-                         section_sp->GetName().AsCString());
-        }
+    if (log) {
+      ModuleSP module_sp = section_sp->GetModule();
+      std::string module_name("<Unknown>");
+      if (module_sp) {
+        const FileSpec &module_file_spec(
+            section_sp->GetModule()->GetFileSpec());
+        module_name = module_file_spec.GetPath();
+      }
+      log->Printf("SectionLoadList::%s (section = %p (%s.%s))", __FUNCTION__,
+                  static_cast<void *>(section_sp.get()), module_name.c_str(),
+                  section_sp->GetName().AsCString());
+    }
 
-        std::lock_guard<std::recursive_mutex> guard(m_mutex);
+    std::lock_guard<std::recursive_mutex> guard(m_mutex);
 
-        sect_to_addr_collection::iterator sta_pos = m_sect_to_addr.find(section_sp.get());
-        if (sta_pos != m_sect_to_addr.end())
-        {
-            ++unload_count;
-            addr_t load_addr = sta_pos->second;
-            m_sect_to_addr.erase (sta_pos);
+    sect_to_addr_collection::iterator sta_pos =
+        m_sect_to_addr.find(section_sp.get());
+    if (sta_pos != m_sect_to_addr.end()) {
+      ++unload_count;
+      addr_t load_addr = sta_pos->second;
+      m_sect_to_addr.erase(sta_pos);
 
-            addr_to_sect_collection::iterator ats_pos = m_addr_to_sect.find(load_addr);
-            if (ats_pos != m_addr_to_sect.end())
-                m_addr_to_sect.erase (ats_pos);
-        }
+      addr_to_sect_collection::iterator ats_pos =
+          m_addr_to_sect.find(load_addr);
+      if (ats_pos != m_addr_to_sect.end())
+        m_addr_to_sect.erase(ats_pos);
     }
-    return unload_count;
+  }
+  return unload_count;
 }
 
-bool
-SectionLoadList::SetSectionUnloaded (const lldb::SectionSP &section_sp, addr_t load_addr)
-{
-    Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_DYNAMIC_LOADER | LIBLLDB_LOG_VERBOSE));
+bool SectionLoadList::SetSectionUnloaded(const lldb::SectionSP &section_sp,
+                                         addr_t load_addr) {
+  Log *log(lldb_private::GetLogIfAnyCategoriesSet(LIBLLDB_LOG_DYNAMIC_LOADER |
+                                                  LIBLLDB_LOG_VERBOSE));
 
-    if (log)
-    {
-        ModuleSP module_sp = section_sp->GetModule();
-        std::string module_name("<Unknown>");
-        if (module_sp)
-        {
-            const FileSpec &module_file_spec (section_sp->GetModule()->GetFileSpec());
-            module_name = module_file_spec.GetPath();
-        }
-        log->Printf ("SectionLoadList::%s (section = %p (%s.%s), load_addr = 0x%16.16" PRIx64 ")",
-                     __FUNCTION__, static_cast<void*>(section_sp.get()),
-                     module_name.c_str(),
-                     section_sp->GetName().AsCString(), load_addr);
-    }
-    bool erased = false;
-    std::lock_guard<std::recursive_mutex> guard(m_mutex);
-    sect_to_addr_collection::iterator sta_pos = m_sect_to_addr.find(section_sp.get());
-    if (sta_pos != m_sect_to_addr.end())
-    {
-        erased = true;
-        m_sect_to_addr.erase (sta_pos);
+  if (log) {
+    ModuleSP module_sp = section_sp->GetModule();
+    std::string module_name("<Unknown>");
+    if (module_sp) {
+      const FileSpec &module_file_spec(section_sp->GetModule()->GetFileSpec());
+      module_name = module_file_spec.GetPath();
     }
+    log->Printf(
+        "SectionLoadList::%s (section = %p (%s.%s), load_addr = 0x%16.16" PRIx64
+        ")",
+        __FUNCTION__, static_cast<void *>(section_sp.get()),
+        module_name.c_str(), section_sp->GetName().AsCString(), load_addr);
+  }
+  bool erased = false;
+  std::lock_guard<std::recursive_mutex> guard(m_mutex);
+  sect_to_addr_collection::iterator sta_pos =
+      m_sect_to_addr.find(section_sp.get());
+  if (sta_pos != m_sect_to_addr.end()) {
+    erased = true;
+    m_sect_to_addr.erase(sta_pos);
+  }
 
-    addr_to_sect_collection::iterator ats_pos = m_addr_to_sect.find(load_addr);
-    if (ats_pos != m_addr_to_sect.end())
-    {
-        erased = true;
-        m_addr_to_sect.erase (ats_pos);
-    }
+  addr_to_sect_collection::iterator ats_pos = m_addr_to_sect.find(load_addr);
+  if (ats_pos != m_addr_to_sect.end()) {
+    erased = true;
+    m_addr_to_sect.erase(ats_pos);
+  }
 
-    return erased;
+  return erased;
 }
 
-
-bool
-SectionLoadList::ResolveLoadAddress (addr_t load_addr, Address &so_addr) const
-{
-    // First find the top level section that this load address exists in
-    std::lock_guard<std::recursive_mutex> guard(m_mutex);
-    if (!m_addr_to_sect.empty())
-    {
-        addr_to_sect_collection::const_iterator pos = m_addr_to_sect.lower_bound (load_addr);
-        if (pos != m_addr_to_sect.end())
-        {
-            if (load_addr != pos->first && pos != m_addr_to_sect.begin())
-                --pos;
-            const addr_t pos_load_addr = pos->first;
-            if (load_addr >= pos_load_addr)
-            {
-                addr_t offset = load_addr - pos_load_addr;
-                if (offset < pos->second->GetByteSize())
-                {
-                    // We have found the top level section, now we need to find the
-                    // deepest child section.
-                    return pos->second->ResolveContainedAddress (offset, so_addr);
-                }
-            }
+bool SectionLoadList::ResolveLoadAddress(addr_t load_addr,
+                                         Address &so_addr) const {
+  // First find the top level section that this load address exists in
+  std::lock_guard<std::recursive_mutex> guard(m_mutex);
+  if (!m_addr_to_sect.empty()) {
+    addr_to_sect_collection::const_iterator pos =
+        m_addr_to_sect.lower_bound(load_addr);
+    if (pos != m_addr_to_sect.end()) {
+      if (load_addr != pos->first && pos != m_addr_to_sect.begin())
+        --pos;
+      const addr_t pos_load_addr = pos->first;
+      if (load_addr >= pos_load_addr) {
+        addr_t offset = load_addr - pos_load_addr;
+        if (offset < pos->second->GetByteSize()) {
+          // We have found the top level section, now we need to find the
+          // deepest child section.
+          return pos->second->ResolveContainedAddress(offset, so_addr);
         }
-        else
-        {
-            // There are no entries that have an address that is >= load_addr,
-            // so we need to check the last entry on our collection.
-            addr_to_sect_collection::const_reverse_iterator rpos = m_addr_to_sect.rbegin();
-            if (load_addr >= rpos->first)
-            {
-                addr_t offset = load_addr - rpos->first;
-                if (offset < rpos->second->GetByteSize())
-                {
-                    // We have found the top level section, now we need to find the
-                    // deepest child section.
-                    return rpos->second->ResolveContainedAddress (offset, so_addr);
-                }
-            }
+      }
+    } else {
+      // There are no entries that have an address that is >= load_addr,
+      // so we need to check the last entry on our collection.
+      addr_to_sect_collection::const_reverse_iterator rpos =
+          m_addr_to_sect.rbegin();
+      if (load_addr >= rpos->first) {
+        addr_t offset = load_addr - rpos->first;
+        if (offset < rpos->second->GetByteSize()) {
+          // We have found the top level section, now we need to find the
+          // deepest child section.
+          return rpos->second->ResolveContainedAddress(offset, so_addr);
         }
+      }
     }
-    so_addr.Clear();
-    return false;
+  }
+  so_addr.Clear();
+  return false;
 }
 
-void
-SectionLoadList::Dump (Stream &s, Target *target)
-{
-    std::lock_guard<std::recursive_mutex> guard(m_mutex);
-    addr_to_sect_collection::const_iterator pos, end;
-    for (pos = m_addr_to_sect.begin(), end = m_addr_to_sect.end(); pos != end; ++pos)
-    {
-        s.Printf("addr = 0x%16.16" PRIx64 ", section = %p: ",
-                 pos->first, static_cast<void*>(pos->second.get()));
-        pos->second->Dump (&s, target, 0);
-    }
+void SectionLoadList::Dump(Stream &s, Target *target) {
+  std::lock_guard<std::recursive_mutex> guard(m_mutex);
+  addr_to_sect_collection::const_iterator pos, end;
+  for (pos = m_addr_to_sect.begin(), end = m_addr_to_sect.end(); pos != end;
+       ++pos) {
+    s.Printf("addr = 0x%16.16" PRIx64 ", section = %p: ", pos->first,
+             static_cast<void *>(pos->second.get()));
+    pos->second->Dump(&s, target, 0);
+  }
 }
-
-