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, 469 insertions, 631 deletions

diff --git a/contrib/llvm/tools/lldb/source/API/SBModule.cpp b/contrib/llvm/tools/lldb/source/API/SBModule.cpp
index bf015f7..8964303 100644
--- a/contrib/llvm/tools/lldb/source/API/SBModule.cpp
+++ b/contrib/llvm/tools/lldb/source/API/SBModule.cpp
@@ -14,8 +14,8 @@
 #include "lldb/API/SBProcess.h"
 #include "lldb/API/SBStream.h"
 #include "lldb/API/SBSymbolContextList.h"
-#include "lldb/Core/Module.h"
 #include "lldb/Core/Log.h"
+#include "lldb/Core/Module.h"
 #include "lldb/Core/Section.h"
 #include "lldb/Core/StreamString.h"
 #include "lldb/Core/ValueObjectList.h"
@@ -31,699 +31,537 @@
 using namespace lldb;
 using namespace lldb_private;
 
+SBModule::SBModule() : m_opaque_sp() {}
 
-SBModule::SBModule () :
-    m_opaque_sp ()
-{
-}
-
-SBModule::SBModule (const lldb::ModuleSP& module_sp) :
-    m_opaque_sp (module_sp)
-{
-}
+SBModule::SBModule(const lldb::ModuleSP &module_sp) : m_opaque_sp(module_sp) {}
 
-SBModule::SBModule(const SBModuleSpec &module_spec) :
-    m_opaque_sp ()
-{
-    ModuleSP module_sp;
-    Error error = ModuleList::GetSharedModule (*module_spec.m_opaque_ap,
-                                               module_sp,
-                                               NULL,
-                                               NULL,
-                                               NULL);
-    if (module_sp)
-        SetSP(module_sp);
+SBModule::SBModule(const SBModuleSpec &module_spec) : m_opaque_sp() {
+  ModuleSP module_sp;
+  Error error = ModuleList::GetSharedModule(*module_spec.m_opaque_ap, module_sp,
+                                            NULL, NULL, NULL);
+  if (module_sp)
+    SetSP(module_sp);
 }
 
-SBModule::SBModule(const SBModule &rhs) :
-    m_opaque_sp (rhs.m_opaque_sp)
-{
-}
+SBModule::SBModule(const SBModule &rhs) : m_opaque_sp(rhs.m_opaque_sp) {}
 
-SBModule::SBModule (lldb::SBProcess &process, lldb::addr_t header_addr) :
-    m_opaque_sp ()
-{
-    ProcessSP process_sp (process.GetSP());
-    if (process_sp)
-    {
-        m_opaque_sp = process_sp->ReadModuleFromMemory (FileSpec(), header_addr);
-        if (m_opaque_sp)
-        {
-            Target &target = process_sp->GetTarget();
-            bool changed = false;
-            m_opaque_sp->SetLoadAddress(target, 0, true, changed);
-            target.GetImages().Append(m_opaque_sp);
-        }
+SBModule::SBModule(lldb::SBProcess &process, lldb::addr_t header_addr)
+    : m_opaque_sp() {
+  ProcessSP process_sp(process.GetSP());
+  if (process_sp) {
+    m_opaque_sp = process_sp->ReadModuleFromMemory(FileSpec(), header_addr);
+    if (m_opaque_sp) {
+      Target &target = process_sp->GetTarget();
+      bool changed = false;
+      m_opaque_sp->SetLoadAddress(target, 0, true, changed);
+      target.GetImages().Append(m_opaque_sp);
     }
+  }
 }
 
-const SBModule &
-SBModule::operator = (const SBModule &rhs)
-{
-    if (this != &rhs)
-        m_opaque_sp = rhs.m_opaque_sp;
-    return *this;
+const SBModule &SBModule::operator=(const SBModule &rhs) {
+  if (this != &rhs)
+    m_opaque_sp = rhs.m_opaque_sp;
+  return *this;
 }
 
-SBModule::~SBModule ()
-{
-}
+SBModule::~SBModule() {}
 
-bool
-SBModule::IsValid () const
-{
-    return m_opaque_sp.get() != NULL;
-}
+bool SBModule::IsValid() const { return m_opaque_sp.get() != NULL; }
 
-void
-SBModule::Clear()
-{
-    m_opaque_sp.reset();
-}
+void SBModule::Clear() { m_opaque_sp.reset(); }
 
-SBFileSpec
-SBModule::GetFileSpec () const
-{
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+SBFileSpec SBModule::GetFileSpec() const {
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
 
-    SBFileSpec file_spec;
-    ModuleSP module_sp (GetSP ());
-    if (module_sp)
-        file_spec.SetFileSpec(module_sp->GetFileSpec());
+  SBFileSpec file_spec;
+  ModuleSP module_sp(GetSP());
+  if (module_sp)
+    file_spec.SetFileSpec(module_sp->GetFileSpec());
 
-    if (log)
-        log->Printf ("SBModule(%p)::GetFileSpec () => SBFileSpec(%p)",
-                     static_cast<void*>(module_sp.get()),
-                     static_cast<const void*>(file_spec.get()));
+  if (log)
+    log->Printf("SBModule(%p)::GetFileSpec () => SBFileSpec(%p)",
+                static_cast<void *>(module_sp.get()),
+                static_cast<const void *>(file_spec.get()));
 
-    return file_spec;
+  return file_spec;
 }
 
-lldb::SBFileSpec
-SBModule::GetPlatformFileSpec () const
-{
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+lldb::SBFileSpec SBModule::GetPlatformFileSpec() const {
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
 
-    SBFileSpec file_spec;
-    ModuleSP module_sp (GetSP ());
-    if (module_sp)
-        file_spec.SetFileSpec(module_sp->GetPlatformFileSpec());
+  SBFileSpec file_spec;
+  ModuleSP module_sp(GetSP());
+  if (module_sp)
+    file_spec.SetFileSpec(module_sp->GetPlatformFileSpec());
 
-    if (log)
-        log->Printf ("SBModule(%p)::GetPlatformFileSpec () => SBFileSpec(%p)",
-                     static_cast<void*>(module_sp.get()),
-                     static_cast<const void*>(file_spec.get()));
+  if (log)
+    log->Printf("SBModule(%p)::GetPlatformFileSpec () => SBFileSpec(%p)",
+                static_cast<void *>(module_sp.get()),
+                static_cast<const void *>(file_spec.get()));
 
-    return file_spec;
+  return file_spec;
 }
 
-bool
-SBModule::SetPlatformFileSpec (const lldb::SBFileSpec &platform_file)
-{
-    bool result = false;
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+bool SBModule::SetPlatformFileSpec(const lldb::SBFileSpec &platform_file) {
+  bool result = false;
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
 
-    ModuleSP module_sp (GetSP ());
-    if (module_sp)
-    {
-        module_sp->SetPlatformFileSpec(*platform_file);
-        result = true;
-    }
+  ModuleSP module_sp(GetSP());
+  if (module_sp) {
+    module_sp->SetPlatformFileSpec(*platform_file);
+    result = true;
+  }
 
-    if (log)
-        log->Printf ("SBModule(%p)::SetPlatformFileSpec (SBFileSpec(%p (%s)) => %i",
-                     static_cast<void*>(module_sp.get()),
-                     static_cast<const void*>(platform_file.get()),
-                     platform_file->GetPath().c_str(), result);
-    return result;
-}
-
-lldb::SBFileSpec
-SBModule::GetRemoteInstallFileSpec ()
-{
-    SBFileSpec sb_file_spec;
-    ModuleSP module_sp (GetSP ());
-    if (module_sp)
-        sb_file_spec.SetFileSpec (module_sp->GetRemoteInstallFileSpec());
-    return sb_file_spec;
-}
-
-bool
-SBModule::SetRemoteInstallFileSpec (lldb::SBFileSpec &file)
-{
-    ModuleSP module_sp (GetSP ());
-    if (module_sp)
-    {
-        module_sp->SetRemoteInstallFileSpec(file.ref());
-        return true;
-    }
-    return false;
+  if (log)
+    log->Printf("SBModule(%p)::SetPlatformFileSpec (SBFileSpec(%p (%s)) => %i",
+                static_cast<void *>(module_sp.get()),
+                static_cast<const void *>(platform_file.get()),
+                platform_file->GetPath().c_str(), result);
+  return result;
 }
 
-
-const uint8_t *
-SBModule::GetUUIDBytes () const
-{
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-
-    const uint8_t *uuid_bytes = NULL;
-    ModuleSP module_sp (GetSP ());
-    if (module_sp)
-        uuid_bytes = (const uint8_t *)module_sp->GetUUID().GetBytes();
-
-    if (log)
-    {
-        if (uuid_bytes)
-        {
-            StreamString s;
-            module_sp->GetUUID().Dump (&s);
-            log->Printf ("SBModule(%p)::GetUUIDBytes () => %s",
-                         static_cast<void*>(module_sp.get()), s.GetData());
-        }
-        else
-            log->Printf ("SBModule(%p)::GetUUIDBytes () => NULL",
-                         static_cast<void*>(module_sp.get()));
-    }
-    return uuid_bytes;
+lldb::SBFileSpec SBModule::GetRemoteInstallFileSpec() {
+  SBFileSpec sb_file_spec;
+  ModuleSP module_sp(GetSP());
+  if (module_sp)
+    sb_file_spec.SetFileSpec(module_sp->GetRemoteInstallFileSpec());
+  return sb_file_spec;
 }
 
-
-const char *
-SBModule::GetUUIDString () const
-{
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-
-    const char *uuid_cstr = NULL;
-    ModuleSP module_sp (GetSP ());
-    if (module_sp)
-    {
-        // We are going to return a "const char *" value through the public
-        // API, so we need to constify it so it gets added permanently the
-        // string pool and then we don't need to worry about the lifetime of the
-        // string as it will never go away once it has been put into the ConstString
-        // string pool
-        uuid_cstr = ConstString(module_sp->GetUUID().GetAsString()).GetCString();
-    }
-
-    if (uuid_cstr && uuid_cstr[0])
-    {
-        if (log)
-            log->Printf ("SBModule(%p)::GetUUIDString () => %s", static_cast<void*>(module_sp.get()), uuid_cstr);
-        return uuid_cstr;
-    }
-
+bool SBModule::SetRemoteInstallFileSpec(lldb::SBFileSpec &file) {
+  ModuleSP module_sp(GetSP());
+  if (module_sp) {
+    module_sp->SetRemoteInstallFileSpec(file.ref());
+    return true;
+  }
+  return false;
+}
+
+const uint8_t *SBModule::GetUUIDBytes() const {
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
+
+  const uint8_t *uuid_bytes = NULL;
+  ModuleSP module_sp(GetSP());
+  if (module_sp)
+    uuid_bytes = (const uint8_t *)module_sp->GetUUID().GetBytes();
+
+  if (log) {
+    if (uuid_bytes) {
+      StreamString s;
+      module_sp->GetUUID().Dump(&s);
+      log->Printf("SBModule(%p)::GetUUIDBytes () => %s",
+                  static_cast<void *>(module_sp.get()), s.GetData());
+    } else
+      log->Printf("SBModule(%p)::GetUUIDBytes () => NULL",
+                  static_cast<void *>(module_sp.get()));
+  }
+  return uuid_bytes;
+}
+
+const char *SBModule::GetUUIDString() const {
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_API));
+
+  const char *uuid_cstr = NULL;
+  ModuleSP module_sp(GetSP());
+  if (module_sp) {
+    // We are going to return a "const char *" value through the public
+    // API, so we need to constify it so it gets added permanently the
+    // string pool and then we don't need to worry about the lifetime of the
+    // string as it will never go away once it has been put into the ConstString
+    // string pool
+    uuid_cstr = ConstString(module_sp->GetUUID().GetAsString()).GetCString();
+  }
+
+  if (uuid_cstr && uuid_cstr[0]) {
     if (log)
-        log->Printf ("SBModule(%p)::GetUUIDString () => NULL", static_cast<void*>(module_sp.get()));
-    return NULL;
-}
-
+      log->Printf("SBModule(%p)::GetUUIDString () => %s",
+                  static_cast<void *>(module_sp.get()), uuid_cstr);
+    return uuid_cstr;
+  }
 
-bool
-SBModule::operator == (const SBModule &rhs) const
-{
-    if (m_opaque_sp)
-        return m_opaque_sp.get() == rhs.m_opaque_sp.get();
-    return false;
+  if (log)
+    log->Printf("SBModule(%p)::GetUUIDString () => NULL",
+                static_cast<void *>(module_sp.get()));
+  return NULL;
 }
 
-bool
-SBModule::operator != (const SBModule &rhs) const
-{
-    if (m_opaque_sp)
-        return m_opaque_sp.get() != rhs.m_opaque_sp.get();
-    return false;
+bool SBModule::operator==(const SBModule &rhs) const {
+  if (m_opaque_sp)
+    return m_opaque_sp.get() == rhs.m_opaque_sp.get();
+  return false;
 }
 
-ModuleSP
-SBModule::GetSP () const
-{
-    return m_opaque_sp;
+bool SBModule::operator!=(const SBModule &rhs) const {
+  if (m_opaque_sp)
+    return m_opaque_sp.get() != rhs.m_opaque_sp.get();
+  return false;
 }
 
-void
-SBModule::SetSP (const ModuleSP &module_sp)
-{
-    m_opaque_sp = module_sp;
-}
+ModuleSP SBModule::GetSP() const { return m_opaque_sp; }
 
-SBAddress
-SBModule::ResolveFileAddress (lldb::addr_t vm_addr)
-{
-    lldb::SBAddress sb_addr;
-    ModuleSP module_sp (GetSP ());
-    if (module_sp)
-    {
-        Address addr;
-        if (module_sp->ResolveFileAddress (vm_addr, addr))
-            sb_addr.ref() = addr;
-    }
-    return sb_addr;
+void SBModule::SetSP(const ModuleSP &module_sp) { m_opaque_sp = module_sp; }
+
+SBAddress SBModule::ResolveFileAddress(lldb::addr_t vm_addr) {
+  lldb::SBAddress sb_addr;
+  ModuleSP module_sp(GetSP());
+  if (module_sp) {
+    Address addr;
+    if (module_sp->ResolveFileAddress(vm_addr, addr))
+      sb_addr.ref() = addr;
+  }
+  return sb_addr;
 }
 
 SBSymbolContext
-SBModule::ResolveSymbolContextForAddress (const SBAddress& addr, uint32_t resolve_scope)
-{
-    SBSymbolContext sb_sc;
-    ModuleSP module_sp (GetSP ());
-    if (module_sp && addr.IsValid())
-        module_sp->ResolveSymbolContextForAddress (addr.ref(), resolve_scope, *sb_sc);
-    return sb_sc;
-}
-
-bool
-SBModule::GetDescription (SBStream &description)
-{
-    Stream &strm = description.ref();
-
-    ModuleSP module_sp (GetSP ());
-    if (module_sp)
-    {
-        module_sp->GetDescription (&strm);
-    }
-    else
-        strm.PutCString ("No value");
-
-    return true;
+SBModule::ResolveSymbolContextForAddress(const SBAddress &addr,
+                                         uint32_t resolve_scope) {
+  SBSymbolContext sb_sc;
+  ModuleSP module_sp(GetSP());
+  if (module_sp && addr.IsValid())
+    module_sp->ResolveSymbolContextForAddress(addr.ref(), resolve_scope,
+                                              *sb_sc);
+  return sb_sc;
+}
+
+bool SBModule::GetDescription(SBStream &description) {
+  Stream &strm = description.ref();
+
+  ModuleSP module_sp(GetSP());
+  if (module_sp) {
+    module_sp->GetDescription(&strm);
+  } else
+    strm.PutCString("No value");
+
+  return true;
+}
+
+uint32_t SBModule::GetNumCompileUnits() {
+  ModuleSP module_sp(GetSP());
+  if (module_sp) {
+    return module_sp->GetNumCompileUnits();
+  }
+  return 0;
+}
+
+SBCompileUnit SBModule::GetCompileUnitAtIndex(uint32_t index) {
+  SBCompileUnit sb_cu;
+  ModuleSP module_sp(GetSP());
+  if (module_sp) {
+    CompUnitSP cu_sp = module_sp->GetCompileUnitAtIndex(index);
+    sb_cu.reset(cu_sp.get());
+  }
+  return sb_cu;
+}
+
+static Symtab *GetUnifiedSymbolTable(const lldb::ModuleSP &module_sp) {
+  if (module_sp) {
+    SymbolVendor *symbols = module_sp->GetSymbolVendor();
+    if (symbols)
+      return symbols->GetSymtab();
+  }
+  return NULL;
+}
+
+size_t SBModule::GetNumSymbols() {
+  ModuleSP module_sp(GetSP());
+  if (module_sp) {
+    Symtab *symtab = GetUnifiedSymbolTable(module_sp);
+    if (symtab)
+      return symtab->GetNumSymbols();
+  }
+  return 0;
 }
 
-uint32_t
-SBModule::GetNumCompileUnits()
-{
-    ModuleSP module_sp (GetSP ());
-    if (module_sp)
-    {
-        return module_sp->GetNumCompileUnits ();
-    }
-    return 0;
+SBSymbol SBModule::GetSymbolAtIndex(size_t idx) {
+  SBSymbol sb_symbol;
+  ModuleSP module_sp(GetSP());
+  Symtab *symtab = GetUnifiedSymbolTable(module_sp);
+  if (symtab)
+    sb_symbol.SetSymbol(symtab->SymbolAtIndex(idx));
+  return sb_symbol;
 }
 
-SBCompileUnit
-SBModule::GetCompileUnitAtIndex (uint32_t index)
-{
-    SBCompileUnit sb_cu;
-    ModuleSP module_sp (GetSP ());
-    if (module_sp)
-    {
-        CompUnitSP cu_sp = module_sp->GetCompileUnitAtIndex (index);
-        sb_cu.reset(cu_sp.get());
-    }
-    return sb_cu;
+lldb::SBSymbol SBModule::FindSymbol(const char *name,
+                                    lldb::SymbolType symbol_type) {
+  SBSymbol sb_symbol;
+  if (name && name[0]) {
+    ModuleSP module_sp(GetSP());
+    Symtab *symtab = GetUnifiedSymbolTable(module_sp);
+    if (symtab)
+      sb_symbol.SetSymbol(symtab->FindFirstSymbolWithNameAndType(
+          ConstString(name), symbol_type, Symtab::eDebugAny,
+          Symtab::eVisibilityAny));
+  }
+  return sb_symbol;
 }
 
-static Symtab *
-GetUnifiedSymbolTable (const lldb::ModuleSP& module_sp)
-{
-    if (module_sp)
-    {
-        SymbolVendor *symbols = module_sp->GetSymbolVendor();
-        if (symbols)
-            return symbols->GetSymtab();
+lldb::SBSymbolContextList SBModule::FindSymbols(const char *name,
+                                                lldb::SymbolType symbol_type) {
+  SBSymbolContextList sb_sc_list;
+  if (name && name[0]) {
+    ModuleSP module_sp(GetSP());
+    Symtab *symtab = GetUnifiedSymbolTable(module_sp);
+    if (symtab) {
+      std::vector<uint32_t> matching_symbol_indexes;
+      const size_t num_matches = symtab->FindAllSymbolsWithNameAndType(
+          ConstString(name), symbol_type, matching_symbol_indexes);
+      if (num_matches) {
+        SymbolContext sc;
+        sc.module_sp = module_sp;
+        SymbolContextList &sc_list = *sb_sc_list;
+        for (size_t i = 0; i < num_matches; ++i) {
+          sc.symbol = symtab->SymbolAtIndex(matching_symbol_indexes[i]);
+          if (sc.symbol)
+            sc_list.Append(sc);
+        }
+      }
     }
-    return NULL;
-}
-
-size_t
-SBModule::GetNumSymbols ()
-{
-    ModuleSP module_sp (GetSP ());
-    if (module_sp)
-    {
-        Symtab *symtab = GetUnifiedSymbolTable (module_sp);
-        if (symtab)
-            return symtab->GetNumSymbols();
+  }
+  return sb_sc_list;
+}
+
+size_t SBModule::GetNumSections() {
+  ModuleSP module_sp(GetSP());
+  if (module_sp) {
+    // Give the symbol vendor a chance to add to the unified section list.
+    module_sp->GetSymbolVendor();
+    SectionList *section_list = module_sp->GetSectionList();
+    if (section_list)
+      return section_list->GetSize();
+  }
+  return 0;
+}
+
+SBSection SBModule::GetSectionAtIndex(size_t idx) {
+  SBSection sb_section;
+  ModuleSP module_sp(GetSP());
+  if (module_sp) {
+    // Give the symbol vendor a chance to add to the unified section list.
+    module_sp->GetSymbolVendor();
+    SectionList *section_list = module_sp->GetSectionList();
+
+    if (section_list)
+      sb_section.SetSP(section_list->GetSectionAtIndex(idx));
+  }
+  return sb_section;
+}
+
+lldb::SBSymbolContextList SBModule::FindFunctions(const char *name,
+                                                  uint32_t name_type_mask) {
+  lldb::SBSymbolContextList sb_sc_list;
+  ModuleSP module_sp(GetSP());
+  if (name && module_sp) {
+    const bool append = true;
+    const bool symbols_ok = true;
+    const bool inlines_ok = true;
+    module_sp->FindFunctions(ConstString(name), NULL, name_type_mask,
+                             symbols_ok, inlines_ok, append, *sb_sc_list);
+  }
+  return sb_sc_list;
+}
+
+SBValueList SBModule::FindGlobalVariables(SBTarget &target, const char *name,
+                                          uint32_t max_matches) {
+  SBValueList sb_value_list;
+  ModuleSP module_sp(GetSP());
+  if (name && module_sp) {
+    VariableList variable_list;
+    const uint32_t match_count = module_sp->FindGlobalVariables(
+        ConstString(name), NULL, false, max_matches, variable_list);
+
+    if (match_count > 0) {
+      for (uint32_t i = 0; i < match_count; ++i) {
+        lldb::ValueObjectSP valobj_sp;
+        TargetSP target_sp(target.GetSP());
+        valobj_sp = ValueObjectVariable::Create(
+            target_sp.get(), variable_list.GetVariableAtIndex(i));
+        if (valobj_sp)
+          sb_value_list.Append(SBValue(valobj_sp));
+      }
     }
-    return 0;
+  }
+
+  return sb_value_list;
 }
 
-SBSymbol
-SBModule::GetSymbolAtIndex (size_t idx)
-{
-    SBSymbol sb_symbol;
-    ModuleSP module_sp (GetSP ());
-    Symtab *symtab = GetUnifiedSymbolTable (module_sp);
-    if (symtab)
-        sb_symbol.SetSymbol(symtab->SymbolAtIndex (idx));
-    return sb_symbol;
-}
-
-lldb::SBSymbol
-SBModule::FindSymbol (const char *name,
-                      lldb::SymbolType symbol_type)
-{
-    SBSymbol sb_symbol;
-    if (name && name[0])
-    {
-        ModuleSP module_sp (GetSP ());
-        Symtab *symtab = GetUnifiedSymbolTable (module_sp);
-        if (symtab)
-            sb_symbol.SetSymbol(symtab->FindFirstSymbolWithNameAndType(ConstString(name), symbol_type, Symtab::eDebugAny, Symtab::eVisibilityAny));
-    }
-    return sb_symbol;
-}
-
-
-lldb::SBSymbolContextList
-SBModule::FindSymbols (const char *name, lldb::SymbolType symbol_type)
-{
-    SBSymbolContextList sb_sc_list;
-    if (name && name[0])
-    {
-        ModuleSP module_sp (GetSP ());
-        Symtab *symtab = GetUnifiedSymbolTable (module_sp);
-        if (symtab)
-        {
-            std::vector<uint32_t> matching_symbol_indexes;
-            const size_t num_matches = symtab->FindAllSymbolsWithNameAndType(ConstString(name), symbol_type, matching_symbol_indexes);
-            if (num_matches)
-            {
-                SymbolContext sc;
-                sc.module_sp = module_sp;
-                SymbolContextList &sc_list = *sb_sc_list;
-                for (size_t i=0; i<num_matches; ++i)
-                {
-                    sc.symbol = symtab->SymbolAtIndex (matching_symbol_indexes[i]);
-                    if (sc.symbol)
-                        sc_list.Append(sc);
-                }
-            }
-        }
-    }
-    return sb_sc_list;
-    
+lldb::SBValue SBModule::FindFirstGlobalVariable(lldb::SBTarget &target,
+                                                const char *name) {
+  SBValueList sb_value_list(FindGlobalVariables(target, name, 1));
+  if (sb_value_list.IsValid() && sb_value_list.GetSize() > 0)
+    return sb_value_list.GetValueAtIndex(0);
+  return SBValue();
 }
 
+lldb::SBType SBModule::FindFirstType(const char *name_cstr) {
+  SBType sb_type;
+  ModuleSP module_sp(GetSP());
+  if (name_cstr && module_sp) {
+    SymbolContext sc;
+    const bool exact_match = false;
+    ConstString name(name_cstr);
 
+    sb_type = SBType(module_sp->FindFirstType(sc, name, exact_match));
 
-size_t
-SBModule::GetNumSections ()
-{
-    ModuleSP module_sp (GetSP ());
-    if (module_sp)
-    {
-        // Give the symbol vendor a chance to add to the unified section list.
-        module_sp->GetSymbolVendor();
-        SectionList *section_list = module_sp->GetSectionList();
-        if (section_list)
-            return section_list->GetSize();
+    if (!sb_type.IsValid()) {
+      TypeSystem *type_system =
+          module_sp->GetTypeSystemForLanguage(eLanguageTypeC);
+      if (type_system)
+        sb_type = SBType(type_system->GetBuiltinTypeByName(name));
     }
-    return 0;
-}
+  }
+  return sb_type;
+}
+
+lldb::SBType SBModule::GetBasicType(lldb::BasicType type) {
+  ModuleSP module_sp(GetSP());
+  if (module_sp) {
+    TypeSystem *type_system =
+        module_sp->GetTypeSystemForLanguage(eLanguageTypeC);
+    if (type_system)
+      return SBType(type_system->GetBasicTypeFromAST(type));
+  }
+  return SBType();
+}
+
+lldb::SBTypeList SBModule::FindTypes(const char *type) {
+  SBTypeList retval;
+
+  ModuleSP module_sp(GetSP());
+  if (type && module_sp) {
+    SymbolContext sc;
+    TypeList type_list;
+    const bool exact_match = false;
+    ConstString name(type);
+    llvm::DenseSet<SymbolFile *> searched_symbol_files;
+    const uint32_t num_matches = module_sp->FindTypes(
+        sc, name, exact_match, UINT32_MAX, searched_symbol_files, type_list);
+
+    if (num_matches > 0) {
+      for (size_t idx = 0; idx < num_matches; idx++) {
+        TypeSP type_sp(type_list.GetTypeAtIndex(idx));
+        if (type_sp)
+          retval.Append(SBType(type_sp));
+      }
+    } else {
+      TypeSystem *type_system =
+          module_sp->GetTypeSystemForLanguage(eLanguageTypeC);
+      if (type_system) {
+        CompilerType compiler_type = type_system->GetBuiltinTypeByName(name);
+        if (compiler_type)
+          retval.Append(SBType(compiler_type));
+      }
+    }
+  }
 
-SBSection
-SBModule::GetSectionAtIndex (size_t idx)
-{
-    SBSection sb_section;
-    ModuleSP module_sp (GetSP ());
-    if (module_sp)
-    {
-        // Give the symbol vendor a chance to add to the unified section list.
-        module_sp->GetSymbolVendor();
-        SectionList *section_list = module_sp->GetSectionList ();
+  return retval;
+}
 
-        if (section_list)
-            sb_section.SetSP(section_list->GetSectionAtIndex (idx));
-    }
-    return sb_section;
-}
-
-lldb::SBSymbolContextList
-SBModule::FindFunctions (const char *name, 
-                         uint32_t name_type_mask)
-{
-    lldb::SBSymbolContextList sb_sc_list;
-    ModuleSP module_sp (GetSP ());
-    if (name && module_sp)
-    {
-        const bool append = true;
-        const bool symbols_ok = true;
-        const bool inlines_ok = true;
-        module_sp->FindFunctions (ConstString(name),
-                                  NULL,
-                                  name_type_mask, 
-                                  symbols_ok,
-                                  inlines_ok,
-                                  append, 
-                                  *sb_sc_list);
+lldb::SBType SBModule::GetTypeByID(lldb::user_id_t uid) {
+  ModuleSP module_sp(GetSP());
+  if (module_sp) {
+    SymbolVendor *vendor = module_sp->GetSymbolVendor();
+    if (vendor) {
+      Type *type_ptr = vendor->ResolveTypeUID(uid);
+      if (type_ptr)
+        return SBType(type_ptr->shared_from_this());
     }
-    return sb_sc_list;
-}
-
-
-SBValueList
-SBModule::FindGlobalVariables (SBTarget &target, const char *name, uint32_t max_matches)
-{
-    SBValueList sb_value_list;
-    ModuleSP module_sp (GetSP ());
-    if (name && module_sp)
-    {
-        VariableList variable_list;
-        const uint32_t match_count = module_sp->FindGlobalVariables (ConstString (name),
-                                                                     NULL,
-                                                                     false, 
-                                                                     max_matches,
-                                                                     variable_list);
-
-        if (match_count > 0)
-        {
-            for (uint32_t i=0; i<match_count; ++i)
-            {
-                lldb::ValueObjectSP valobj_sp;
-                TargetSP target_sp (target.GetSP());
-                valobj_sp = ValueObjectVariable::Create (target_sp.get(), variable_list.GetVariableAtIndex(i));
-                if (valobj_sp)
-                    sb_value_list.Append(SBValue(valobj_sp));
-            }
-        }
-    }
-    
-    return sb_value_list;
-}
-
-lldb::SBValue
-SBModule::FindFirstGlobalVariable (lldb::SBTarget &target, const char *name)
-{
-    SBValueList sb_value_list(FindGlobalVariables(target, name, 1));
-    if (sb_value_list.IsValid() && sb_value_list.GetSize() > 0)
-        return sb_value_list.GetValueAtIndex(0);
-    return SBValue();
-}
-
-lldb::SBType
-SBModule::FindFirstType (const char *name_cstr)
-{
-    SBType sb_type;
-    ModuleSP module_sp (GetSP ());
-    if (name_cstr && module_sp)
-    {
-        SymbolContext sc;
-        const bool exact_match = false;
-        ConstString name(name_cstr);
-
-        sb_type = SBType (module_sp->FindFirstType(sc, name, exact_match));
-        
-        if (!sb_type.IsValid())
-        {
-            TypeSystem *type_system = module_sp->GetTypeSystemForLanguage(eLanguageTypeC);
-            if (type_system)
-                sb_type = SBType (type_system->GetBuiltinTypeByName(name));
-        }
-    }
-    return sb_type;
-}
-
-lldb::SBType
-SBModule::GetBasicType(lldb::BasicType type)
-{
-    ModuleSP module_sp (GetSP ());
-    if (module_sp)
-    {
-        TypeSystem *type_system = module_sp->GetTypeSystemForLanguage(eLanguageTypeC);
-        if (type_system)
-            return SBType (type_system->GetBasicTypeFromAST(type));
-    }
-    return SBType();
+  }
+  return SBType();
 }
 
-lldb::SBTypeList
-SBModule::FindTypes (const char *type)
-{
-    SBTypeList retval;
-    
-    ModuleSP module_sp (GetSP ());
-    if (type && module_sp)
-    {
-        SymbolContext sc;
-        TypeList type_list;
-        const bool exact_match = false;
-        ConstString name(type);
-        llvm::DenseSet<SymbolFile *> searched_symbol_files;
-        const uint32_t num_matches = module_sp->FindTypes (sc,
-                                                           name,
-                                                           exact_match,
-                                                           UINT32_MAX,
-                                                           searched_symbol_files,
-                                                           type_list);
-        
-        if (num_matches > 0)
-        {
-            for (size_t idx = 0; idx < num_matches; idx++)
-            {
-                TypeSP type_sp (type_list.GetTypeAtIndex(idx));
-                if (type_sp)
-                    retval.Append(SBType(type_sp));
-            }
-        }
-        else
-        {
-            TypeSystem *type_system = module_sp->GetTypeSystemForLanguage(eLanguageTypeC);
-            if (type_system)
-            {
-                CompilerType compiler_type = type_system->GetBuiltinTypeByName(name);
-                if (compiler_type)
-                    retval.Append(SBType(compiler_type));
-            }
-        }
-    }
+lldb::SBTypeList SBModule::GetTypes(uint32_t type_mask) {
+  SBTypeList sb_type_list;
 
-    return retval;
-}
-
-lldb::SBType
-SBModule::GetTypeByID (lldb::user_id_t uid)
-{
-    ModuleSP module_sp (GetSP ());
-    if (module_sp)
-    {
-        SymbolVendor* vendor = module_sp->GetSymbolVendor();
-        if (vendor)
-        {
-            Type *type_ptr = vendor->ResolveTypeUID(uid);
-            if (type_ptr)
-                return SBType(type_ptr->shared_from_this());
-        }
+  ModuleSP module_sp(GetSP());
+  if (module_sp) {
+    SymbolVendor *vendor = module_sp->GetSymbolVendor();
+    if (vendor) {
+      TypeList type_list;
+      vendor->GetTypes(NULL, type_mask, type_list);
+      sb_type_list.m_opaque_ap->Append(type_list);
     }
-    return SBType();
-}
-
-lldb::SBTypeList
-SBModule::GetTypes (uint32_t type_mask)
-{
-    SBTypeList sb_type_list;
-    
-    ModuleSP module_sp (GetSP ());
-    if (module_sp)
-    {
-        SymbolVendor* vendor = module_sp->GetSymbolVendor();
-        if (vendor)
-        {
-            TypeList type_list;
-            vendor->GetTypes (NULL, type_mask, type_list);
-            sb_type_list.m_opaque_ap->Append(type_list);
-        }
+  }
+  return sb_type_list;
+}
+
+SBSection SBModule::FindSection(const char *sect_name) {
+  SBSection sb_section;
+
+  ModuleSP module_sp(GetSP());
+  if (sect_name && module_sp) {
+    // Give the symbol vendor a chance to add to the unified section list.
+    module_sp->GetSymbolVendor();
+    SectionList *section_list = module_sp->GetSectionList();
+    if (section_list) {
+      ConstString const_sect_name(sect_name);
+      SectionSP section_sp(section_list->FindSectionByName(const_sect_name));
+      if (section_sp) {
+        sb_section.SetSP(section_sp);
+      }
     }
-    return sb_type_list;
-}
-
-SBSection
-SBModule::FindSection (const char *sect_name)
-{
-    SBSection sb_section;
-    
-    ModuleSP module_sp (GetSP ());
-    if (sect_name && module_sp)
-    {
-        // Give the symbol vendor a chance to add to the unified section list.
-        module_sp->GetSymbolVendor();
-        SectionList *section_list = module_sp->GetSectionList();
-        if (section_list)
-        {
-            ConstString const_sect_name(sect_name);
-            SectionSP section_sp (section_list->FindSectionByName(const_sect_name));
-            if (section_sp)
-            {
-                sb_section.SetSP (section_sp);
-            }
-        }
+  }
+  return sb_section;
+}
+
+lldb::ByteOrder SBModule::GetByteOrder() {
+  ModuleSP module_sp(GetSP());
+  if (module_sp)
+    return module_sp->GetArchitecture().GetByteOrder();
+  return eByteOrderInvalid;
+}
+
+const char *SBModule::GetTriple() {
+  ModuleSP module_sp(GetSP());
+  if (module_sp) {
+    std::string triple(module_sp->GetArchitecture().GetTriple().str());
+    // Unique the string so we don't run into ownership issues since
+    // the const strings put the string into the string pool once and
+    // the strings never comes out
+    ConstString const_triple(triple.c_str());
+    return const_triple.GetCString();
+  }
+  return NULL;
+}
+
+uint32_t SBModule::GetAddressByteSize() {
+  ModuleSP module_sp(GetSP());
+  if (module_sp)
+    return module_sp->GetArchitecture().GetAddressByteSize();
+  return sizeof(void *);
+}
+
+uint32_t SBModule::GetVersion(uint32_t *versions, uint32_t num_versions) {
+  ModuleSP module_sp(GetSP());
+  if (module_sp)
+    return module_sp->GetVersion(versions, num_versions);
+  else {
+    if (versions && num_versions) {
+      for (uint32_t i = 0; i < num_versions; ++i)
+        versions[i] = UINT32_MAX;
     }
-    return sb_section;
-}
-
-lldb::ByteOrder
-SBModule::GetByteOrder ()
-{
-    ModuleSP module_sp (GetSP ());
-    if (module_sp)
-        return module_sp->GetArchitecture().GetByteOrder();
-    return eByteOrderInvalid;
-}
-
-const char *
-SBModule::GetTriple ()
-{
-    ModuleSP module_sp (GetSP ());
-    if (module_sp)
-    {
-        std::string triple (module_sp->GetArchitecture().GetTriple().str());
-        // Unique the string so we don't run into ownership issues since
-        // the const strings put the string into the string pool once and
-        // the strings never comes out
-        ConstString const_triple (triple.c_str());
-        return const_triple.GetCString();
-    }
-    return NULL;
-}
-
-uint32_t
-SBModule::GetAddressByteSize()
-{
-    ModuleSP module_sp (GetSP ());
-    if (module_sp)
-        return module_sp->GetArchitecture().GetAddressByteSize();
-    return sizeof(void*);
-}
-
-
-uint32_t
-SBModule::GetVersion (uint32_t *versions, uint32_t num_versions)
-{
-    ModuleSP module_sp (GetSP ());
-    if (module_sp)
-        return module_sp->GetVersion(versions, num_versions);
-    else
-    {
-        if (versions && num_versions)
-        {
-            for (uint32_t i=0; i<num_versions; ++i)
-                versions[i] = UINT32_MAX;
-        }
-        return 0;
-    }
-}
-
-lldb::SBFileSpec
-SBModule::GetSymbolFileSpec() const
-{
-    lldb::SBFileSpec sb_file_spec;
-    ModuleSP module_sp(GetSP());
-    if (module_sp)
-    {
-        SymbolVendor *symbol_vendor_ptr = module_sp->GetSymbolVendor();
-        if (symbol_vendor_ptr)
-            sb_file_spec.SetFileSpec(symbol_vendor_ptr->GetMainFileSpec());
-    }
-    return sb_file_spec;
-}
-
-lldb::SBAddress
-SBModule::GetObjectFileHeaderAddress() const
-{
-    lldb::SBAddress sb_addr;
-    ModuleSP module_sp (GetSP ());
-    if (module_sp)
-    {
-        ObjectFile *objfile_ptr = module_sp->GetObjectFile();
-        if (objfile_ptr)
-            sb_addr.ref() = objfile_ptr->GetHeaderAddress();
-    }
-    return sb_addr;
+    return 0;
+  }
+}
+
+lldb::SBFileSpec SBModule::GetSymbolFileSpec() const {
+  lldb::SBFileSpec sb_file_spec;
+  ModuleSP module_sp(GetSP());
+  if (module_sp) {
+    SymbolVendor *symbol_vendor_ptr = module_sp->GetSymbolVendor();
+    if (symbol_vendor_ptr)
+      sb_file_spec.SetFileSpec(symbol_vendor_ptr->GetMainFileSpec());
+  }
+  return sb_file_spec;
+}
+
+lldb::SBAddress SBModule::GetObjectFileHeaderAddress() const {
+  lldb::SBAddress sb_addr;
+  ModuleSP module_sp(GetSP());
+  if (module_sp) {
+    ObjectFile *objfile_ptr = module_sp->GetObjectFile();
+    if (objfile_ptr)
+      sb_addr.ref() = objfile_ptr->GetHeaderAddress();
+  }
+  return sb_addr;
 }