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, 269 insertions, 271 deletions

diff --git a/contrib/llvm/tools/lldb/source/Utility/ModuleCache.cpp b/contrib/llvm/tools/lldb/source/Utility/ModuleCache.cpp
index 92520f7..889cd8f 100644
--- a/contrib/llvm/tools/lldb/source/Utility/ModuleCache.cpp
+++ b/contrib/llvm/tools/lldb/source/Utility/ModuleCache.cpp
@@ -28,311 +28,309 @@ using namespace lldb_private;
 
 namespace {
 
-const char* kModulesSubdir = ".cache";
-const char* kLockDirName = ".lock";
-const char* kTempFileName = ".temp";
-const char* kTempSymFileName = ".symtemp";
-const char* kSymFileExtension = ".sym";
-const char* kFSIllegalChars = "\\/:*?\"<>|";
-
-std::string
-GetEscapedHostname(const char* hostname)
-{
-    std::string result(hostname);
-    size_t size = result.size();
-    for (size_t i = 0; i < size; ++i)
-    {
-        if ((result[i] >=1 && result[i] <= 31) ||
-            strchr(kFSIllegalChars, result[i]) != nullptr)
-            result[i] = '_';
-    }
-    return result;
+const char *kModulesSubdir = ".cache";
+const char *kLockDirName = ".lock";
+const char *kTempFileName = ".temp";
+const char *kTempSymFileName = ".symtemp";
+const char *kSymFileExtension = ".sym";
+const char *kFSIllegalChars = "\\/:*?\"<>|";
+
+std::string GetEscapedHostname(const char *hostname) {
+  if (hostname == nullptr)
+    hostname = "unknown";
+  std::string result(hostname);
+  size_t size = result.size();
+  for (size_t i = 0; i < size; ++i) {
+    if ((result[i] >= 1 && result[i] <= 31) ||
+        strchr(kFSIllegalChars, result[i]) != nullptr)
+      result[i] = '_';
+  }
+  return result;
 }
 
-class ModuleLock
-{
+class ModuleLock {
 private:
-    File m_file;
-    std::unique_ptr<lldb_private::LockFile> m_lock;
-    FileSpec m_file_spec;
+  File m_file;
+  std::unique_ptr<lldb_private::LockFile> m_lock;
+  FileSpec m_file_spec;
 
 public:
-    ModuleLock (const FileSpec &root_dir_spec, const UUID &uuid, Error& error);
-    void Delete ();
+  ModuleLock(const FileSpec &root_dir_spec, const UUID &uuid, Error &error);
+  void Delete();
 };
 
-FileSpec
-JoinPath (const FileSpec &path1, const char* path2)
-{
-    FileSpec result_spec (path1);
-    result_spec.AppendPathComponent (path2);
-    return result_spec;
+FileSpec JoinPath(const FileSpec &path1, const char *path2) {
+  FileSpec result_spec(path1);
+  result_spec.AppendPathComponent(path2);
+  return result_spec;
 }
 
-Error
-MakeDirectory (const FileSpec &dir_path)
-{
-    if (dir_path.Exists ())
-    {
-        if (!dir_path.IsDirectory ())
-            return Error ("Invalid existing path");
+Error MakeDirectory(const FileSpec &dir_path) {
+  if (dir_path.Exists()) {
+    if (!dir_path.IsDirectory())
+      return Error("Invalid existing path");
 
-        return Error ();
-    }
+    return Error();
+  }
 
-    return FileSystem::MakeDirectory(dir_path, eFilePermissionsDirectoryDefault);
+  return FileSystem::MakeDirectory(dir_path, eFilePermissionsDirectoryDefault);
 }
 
-FileSpec
-GetModuleDirectory (const FileSpec &root_dir_spec, const UUID &uuid)
-{
-    const auto modules_dir_spec = JoinPath (root_dir_spec, kModulesSubdir);
-    return JoinPath (modules_dir_spec, uuid.GetAsString ().c_str ());
+FileSpec GetModuleDirectory(const FileSpec &root_dir_spec, const UUID &uuid) {
+  const auto modules_dir_spec = JoinPath(root_dir_spec, kModulesSubdir);
+  return JoinPath(modules_dir_spec, uuid.GetAsString().c_str());
 }
 
-FileSpec
-GetSymbolFileSpec(const FileSpec& module_file_spec)
-{
-    return FileSpec((module_file_spec.GetPath() + kSymFileExtension).c_str(), false);
+FileSpec GetSymbolFileSpec(const FileSpec &module_file_spec) {
+  return FileSpec(module_file_spec.GetPath() + kSymFileExtension, false);
 }
 
-void
-DeleteExistingModule (const FileSpec &root_dir_spec, const FileSpec &sysroot_module_path_spec)
-{
-    Log *log (GetLogIfAllCategoriesSet (LIBLLDB_LOG_MODULES));
-    UUID module_uuid;
-    {
-        auto module_sp = std::make_shared<Module>(ModuleSpec (sysroot_module_path_spec));
-        module_uuid = module_sp->GetUUID ();
-    }
-
-    if (!module_uuid.IsValid ())
-        return;
-
-    Error error;
-    ModuleLock lock (root_dir_spec,  module_uuid, error);
-    if (error.Fail ())
-    {
-        if (log)
-            log->Printf ("Failed to lock module %s: %s",
-                         module_uuid.GetAsString ().c_str (),
-                         error.AsCString ());
-    }
-
-    auto link_count = FileSystem::GetHardlinkCount (sysroot_module_path_spec);
-    if (link_count == -1)
-        return;
-
-    if (link_count > 2)  // module is referred by other hosts.
-        return;
-
-    const auto module_spec_dir = GetModuleDirectory (root_dir_spec, module_uuid);
-    FileSystem::DeleteDirectory (module_spec_dir, true);
-    lock.Delete();
+void DeleteExistingModule(const FileSpec &root_dir_spec,
+                          const FileSpec &sysroot_module_path_spec) {
+  Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_MODULES));
+  UUID module_uuid;
+  {
+    auto module_sp =
+        std::make_shared<Module>(ModuleSpec(sysroot_module_path_spec));
+    module_uuid = module_sp->GetUUID();
+  }
+
+  if (!module_uuid.IsValid())
+    return;
+
+  Error error;
+  ModuleLock lock(root_dir_spec, module_uuid, error);
+  if (error.Fail()) {
+    if (log)
+      log->Printf("Failed to lock module %s: %s",
+                  module_uuid.GetAsString().c_str(), error.AsCString());
+  }
+
+  auto link_count = FileSystem::GetHardlinkCount(sysroot_module_path_spec);
+  if (link_count == -1)
+    return;
+
+  if (link_count > 2) // module is referred by other hosts.
+    return;
+
+  const auto module_spec_dir = GetModuleDirectory(root_dir_spec, module_uuid);
+  FileSystem::DeleteDirectory(module_spec_dir, true);
+  lock.Delete();
 }
 
-void
-DecrementRefExistingModule (const FileSpec &root_dir_spec, const FileSpec &sysroot_module_path_spec)
-{
-    // Remove $platform/.cache/$uuid folder if nobody else references it.
-    DeleteExistingModule (root_dir_spec, sysroot_module_path_spec);
+void DecrementRefExistingModule(const FileSpec &root_dir_spec,
+                                const FileSpec &sysroot_module_path_spec) {
+  // Remove $platform/.cache/$uuid folder if nobody else references it.
+  DeleteExistingModule(root_dir_spec, sysroot_module_path_spec);
 
-    // Remove sysroot link.
-    FileSystem::Unlink (sysroot_module_path_spec);
+  // Remove sysroot link.
+  FileSystem::Unlink(sysroot_module_path_spec);
 
-    FileSpec symfile_spec = GetSymbolFileSpec (sysroot_module_path_spec);
-    if (symfile_spec.Exists ())  // delete module's symbol file if exists.
-        FileSystem::Unlink (symfile_spec);
+  FileSpec symfile_spec = GetSymbolFileSpec(sysroot_module_path_spec);
+  if (symfile_spec.Exists()) // delete module's symbol file if exists.
+    FileSystem::Unlink(symfile_spec);
 }
 
-Error
-CreateHostSysRootModuleLink (const FileSpec &root_dir_spec, const char *hostname,
-                             const FileSpec &platform_module_spec,
-                             const FileSpec &local_module_spec,
-                             bool delete_existing)
-{
-    const auto sysroot_module_path_spec = JoinPath (
-        JoinPath (root_dir_spec, hostname), platform_module_spec.GetPath ().c_str ());
-    if (sysroot_module_path_spec.Exists())
-    {
-        if (!delete_existing)
-            return Error ();
-
-        DecrementRefExistingModule (root_dir_spec, sysroot_module_path_spec);
-    }
-
-    const auto error = MakeDirectory (FileSpec (sysroot_module_path_spec.GetDirectory ().AsCString (), false));
-    if (error.Fail ())
-        return error;
-
-    return FileSystem::Hardlink(sysroot_module_path_spec, local_module_spec);
+Error CreateHostSysRootModuleLink(const FileSpec &root_dir_spec,
+                                  const char *hostname,
+                                  const FileSpec &platform_module_spec,
+                                  const FileSpec &local_module_spec,
+                                  bool delete_existing) {
+  const auto sysroot_module_path_spec =
+      JoinPath(JoinPath(root_dir_spec, hostname),
+               platform_module_spec.GetPath().c_str());
+  if (sysroot_module_path_spec.Exists()) {
+    if (!delete_existing)
+      return Error();
+
+    DecrementRefExistingModule(root_dir_spec, sysroot_module_path_spec);
+  }
+
+  const auto error = MakeDirectory(
+      FileSpec(sysroot_module_path_spec.GetDirectory().AsCString(), false));
+  if (error.Fail())
+    return error;
+
+  return FileSystem::Hardlink(sysroot_module_path_spec, local_module_spec);
 }
 
-}  // namespace
-
-ModuleLock::ModuleLock (const FileSpec &root_dir_spec, const UUID &uuid, Error& error)
-{
-    const auto lock_dir_spec = JoinPath (root_dir_spec, kLockDirName);
-    error = MakeDirectory (lock_dir_spec);
-    if (error.Fail ())
-        return;
-
-    m_file_spec = JoinPath (lock_dir_spec, uuid.GetAsString ().c_str ());
-    m_file.Open (m_file_spec.GetCString (),
-                 File::eOpenOptionWrite | File::eOpenOptionCanCreate | File::eOpenOptionCloseOnExec);
-    if (!m_file)
-    {
-        error.SetErrorToErrno ();
-        return;
-    }
-
-    m_lock.reset (new lldb_private::LockFile (m_file.GetDescriptor ()));
-    error = m_lock->WriteLock (0, 1);
-    if (error.Fail ())
-        error.SetErrorStringWithFormat ("Failed to lock file: %s", error.AsCString ());
+} // namespace
+
+ModuleLock::ModuleLock(const FileSpec &root_dir_spec, const UUID &uuid,
+                       Error &error) {
+  const auto lock_dir_spec = JoinPath(root_dir_spec, kLockDirName);
+  error = MakeDirectory(lock_dir_spec);
+  if (error.Fail())
+    return;
+
+  m_file_spec = JoinPath(lock_dir_spec, uuid.GetAsString().c_str());
+  m_file.Open(m_file_spec.GetCString(), File::eOpenOptionWrite |
+                                            File::eOpenOptionCanCreate |
+                                            File::eOpenOptionCloseOnExec);
+  if (!m_file) {
+    error.SetErrorToErrno();
+    return;
+  }
+
+  m_lock.reset(new lldb_private::LockFile(m_file.GetDescriptor()));
+  error = m_lock->WriteLock(0, 1);
+  if (error.Fail())
+    error.SetErrorStringWithFormat("Failed to lock file: %s",
+                                   error.AsCString());
 }
 
-void ModuleLock::Delete ()
-{
-    if (!m_file)
-        return;
+void ModuleLock::Delete() {
+  if (!m_file)
+    return;
 
-    m_file.Close ();
-    FileSystem::Unlink (m_file_spec);
+  m_file.Close();
+  FileSystem::Unlink(m_file_spec);
 }
 
 /////////////////////////////////////////////////////////////////////////
 
-Error
-ModuleCache::Put (const FileSpec &root_dir_spec,
-                  const char *hostname,
-                  const ModuleSpec &module_spec,
-                  const FileSpec &tmp_file,
-                  const FileSpec &target_file)
-{
-    const auto module_spec_dir = GetModuleDirectory (root_dir_spec, module_spec.GetUUID ());
-    const auto module_file_path = JoinPath (module_spec_dir, target_file.GetFilename ().AsCString ());
-
-    const auto tmp_file_path = tmp_file.GetPath ();
-    const auto err_code = llvm::sys::fs::rename (tmp_file_path.c_str (), module_file_path.GetPath ().c_str ());
-    if (err_code)
-        return Error ("Failed to rename file %s to %s: %s",
-                      tmp_file_path.c_str (), module_file_path.GetPath ().c_str (), err_code.message ().c_str ());
-
-    const auto error = CreateHostSysRootModuleLink(root_dir_spec, hostname, target_file, module_file_path, true);
-    if (error.Fail ())
-        return Error ("Failed to create link to %s: %s", module_file_path.GetPath ().c_str (), error.AsCString ());
-    return Error ();
+Error ModuleCache::Put(const FileSpec &root_dir_spec, const char *hostname,
+                       const ModuleSpec &module_spec, const FileSpec &tmp_file,
+                       const FileSpec &target_file) {
+  const auto module_spec_dir =
+      GetModuleDirectory(root_dir_spec, module_spec.GetUUID());
+  const auto module_file_path =
+      JoinPath(module_spec_dir, target_file.GetFilename().AsCString());
+
+  const auto tmp_file_path = tmp_file.GetPath();
+  const auto err_code =
+      llvm::sys::fs::rename(tmp_file_path, module_file_path.GetPath());
+  if (err_code)
+    return Error("Failed to rename file %s to %s: %s", tmp_file_path.c_str(),
+                 module_file_path.GetPath().c_str(),
+                 err_code.message().c_str());
+
+  const auto error = CreateHostSysRootModuleLink(
+      root_dir_spec, hostname, target_file, module_file_path, true);
+  if (error.Fail())
+    return Error("Failed to create link to %s: %s",
+                 module_file_path.GetPath().c_str(), error.AsCString());
+  return Error();
 }
 
-Error
-ModuleCache::Get (const FileSpec &root_dir_spec,
-                  const char *hostname,
-                  const ModuleSpec &module_spec,
-                  ModuleSP &cached_module_sp,
-                  bool *did_create_ptr)
-{
-    const auto find_it = m_loaded_modules.find (module_spec.GetUUID ().GetAsString());
-    if (find_it != m_loaded_modules.end ())
-    {
-        cached_module_sp = (*find_it).second.lock ();
-        if (cached_module_sp)
-            return Error ();
-        m_loaded_modules.erase (find_it);
-    }
-
-    const auto module_spec_dir = GetModuleDirectory (root_dir_spec, module_spec.GetUUID ());
-    const auto module_file_path = JoinPath (module_spec_dir, module_spec.GetFileSpec ().GetFilename ().AsCString ());
-
-    if (!module_file_path.Exists ())
-        return Error ("Module %s not found", module_file_path.GetPath ().c_str ());
-    if (module_file_path.GetByteSize () != module_spec.GetObjectSize ())
-        return Error ("Module %s has invalid file size", module_file_path.GetPath ().c_str ());
-
-    // We may have already cached module but downloaded from an another host - in this case let's create a link to it.
-    auto error = CreateHostSysRootModuleLink(root_dir_spec, hostname, module_spec.GetFileSpec(), module_file_path, false);
-    if (error.Fail ())
-        return Error ("Failed to create link to %s: %s", module_file_path.GetPath().c_str(), error.AsCString());
-
-    auto cached_module_spec (module_spec);
-    cached_module_spec.GetUUID ().Clear ();  // Clear UUID since it may contain md5 content hash instead of real UUID.
-    cached_module_spec.GetFileSpec () = module_file_path;
-    cached_module_spec.GetPlatformFileSpec () = module_spec.GetFileSpec ();
-    
-    error = ModuleList::GetSharedModule(cached_module_spec,
-                                        cached_module_sp,
-                                        nullptr,
-                                        nullptr,
-                                        did_create_ptr,
-                                        false);
-    if (error.Fail())
-        return error;
-
-    FileSpec symfile_spec = GetSymbolFileSpec(cached_module_sp->GetFileSpec ());
-    if (symfile_spec.Exists ())
-        cached_module_sp->SetSymbolFileFileSpec (symfile_spec);
-
-    m_loaded_modules.insert (std::make_pair (module_spec.GetUUID ().GetAsString (), cached_module_sp));
-
-    return Error ();
+Error ModuleCache::Get(const FileSpec &root_dir_spec, const char *hostname,
+                       const ModuleSpec &module_spec,
+                       ModuleSP &cached_module_sp, bool *did_create_ptr) {
+  const auto find_it =
+      m_loaded_modules.find(module_spec.GetUUID().GetAsString());
+  if (find_it != m_loaded_modules.end()) {
+    cached_module_sp = (*find_it).second.lock();
+    if (cached_module_sp)
+      return Error();
+    m_loaded_modules.erase(find_it);
+  }
+
+  const auto module_spec_dir =
+      GetModuleDirectory(root_dir_spec, module_spec.GetUUID());
+  const auto module_file_path = JoinPath(
+      module_spec_dir, module_spec.GetFileSpec().GetFilename().AsCString());
+
+  if (!module_file_path.Exists())
+    return Error("Module %s not found", module_file_path.GetPath().c_str());
+  if (module_file_path.GetByteSize() != module_spec.GetObjectSize())
+    return Error("Module %s has invalid file size",
+                 module_file_path.GetPath().c_str());
+
+  // We may have already cached module but downloaded from an another host - in
+  // this case let's create a link to it.
+  auto error = CreateHostSysRootModuleLink(root_dir_spec, hostname,
+                                           module_spec.GetFileSpec(),
+                                           module_file_path, false);
+  if (error.Fail())
+    return Error("Failed to create link to %s: %s",
+                 module_file_path.GetPath().c_str(), error.AsCString());
+
+  auto cached_module_spec(module_spec);
+  cached_module_spec.GetUUID().Clear(); // Clear UUID since it may contain md5
+                                        // content hash instead of real UUID.
+  cached_module_spec.GetFileSpec() = module_file_path;
+  cached_module_spec.GetPlatformFileSpec() = module_spec.GetFileSpec();
+
+  error = ModuleList::GetSharedModule(cached_module_spec, cached_module_sp,
+                                      nullptr, nullptr, did_create_ptr, false);
+  if (error.Fail())
+    return error;
+
+  FileSpec symfile_spec = GetSymbolFileSpec(cached_module_sp->GetFileSpec());
+  if (symfile_spec.Exists())
+    cached_module_sp->SetSymbolFileFileSpec(symfile_spec);
+
+  m_loaded_modules.insert(
+      std::make_pair(module_spec.GetUUID().GetAsString(), cached_module_sp));
+
+  return Error();
 }
 
-Error
-ModuleCache::GetAndPut (const FileSpec &root_dir_spec,
-                        const char *hostname,
-                        const ModuleSpec &module_spec,
-                        const ModuleDownloader &module_downloader,
-                        const SymfileDownloader &symfile_downloader,
-                        lldb::ModuleSP &cached_module_sp,
-                        bool *did_create_ptr)
-{
-    const auto module_spec_dir = GetModuleDirectory (root_dir_spec, module_spec.GetUUID ());
-    auto error = MakeDirectory (module_spec_dir);
-    if (error.Fail ())
-        return error;
-
-    ModuleLock lock (root_dir_spec,  module_spec.GetUUID (), error);
-    if (error.Fail ())
-        return Error("Failed to lock module %s: %s", module_spec.GetUUID ().GetAsString().c_str(), error.AsCString ());
-
-    const auto escaped_hostname(GetEscapedHostname(hostname));
-    // Check local cache for a module.
-    error = Get (root_dir_spec, escaped_hostname.c_str(), module_spec, cached_module_sp, did_create_ptr);
-    if (error.Success ())
-        return error;
-
-    const auto tmp_download_file_spec = JoinPath (module_spec_dir, kTempFileName);
-    error = module_downloader (module_spec, tmp_download_file_spec);
-    llvm::FileRemover tmp_file_remover (tmp_download_file_spec.GetPath ().c_str ());
-    if (error.Fail ())
-        return Error("Failed to download module: %s", error.AsCString ());
-
-    // Put downloaded file into local module cache.
-    error = Put (root_dir_spec, escaped_hostname.c_str(), module_spec, tmp_download_file_spec, module_spec.GetFileSpec ());
-    if (error.Fail ())
-        return Error ("Failed to put module into cache: %s", error.AsCString ());
-
-    tmp_file_remover.releaseFile ();
-    error = Get (root_dir_spec, escaped_hostname.c_str(), module_spec, cached_module_sp, did_create_ptr);
-    if (error.Fail ())
-        return error;
-
-    // Fetching a symbol file for the module
-    const auto tmp_download_sym_file_spec = JoinPath (module_spec_dir, kTempSymFileName);
-    error = symfile_downloader (cached_module_sp, tmp_download_sym_file_spec);
-    llvm::FileRemover tmp_symfile_remover (tmp_download_sym_file_spec.GetPath ().c_str ());
-    if (error.Fail ())
-        // Failed to download a symfile but fetching the module was successful. The module might
-        // contain the neccessary symbols and the debugging is also possible without a symfile.
-        return Error ();
-
-    error = Put (root_dir_spec, escaped_hostname.c_str(), module_spec, tmp_download_sym_file_spec, GetSymbolFileSpec(module_spec.GetFileSpec ()));
-    if (error.Fail ())
-        return Error ("Failed to put symbol file into cache: %s", error.AsCString ());
-    
-    tmp_symfile_remover.releaseFile();
-
-    FileSpec symfile_spec = GetSymbolFileSpec (cached_module_sp->GetFileSpec ());
-    cached_module_sp->SetSymbolFileFileSpec (symfile_spec);
-    return Error ();
+Error ModuleCache::GetAndPut(const FileSpec &root_dir_spec,
+                             const char *hostname,
+                             const ModuleSpec &module_spec,
+                             const ModuleDownloader &module_downloader,
+                             const SymfileDownloader &symfile_downloader,
+                             lldb::ModuleSP &cached_module_sp,
+                             bool *did_create_ptr) {
+  const auto module_spec_dir =
+      GetModuleDirectory(root_dir_spec, module_spec.GetUUID());
+  auto error = MakeDirectory(module_spec_dir);
+  if (error.Fail())
+    return error;
+
+  ModuleLock lock(root_dir_spec, module_spec.GetUUID(), error);
+  if (error.Fail())
+    return Error("Failed to lock module %s: %s",
+                 module_spec.GetUUID().GetAsString().c_str(),
+                 error.AsCString());
+
+  const auto escaped_hostname(GetEscapedHostname(hostname));
+  // Check local cache for a module.
+  error = Get(root_dir_spec, escaped_hostname.c_str(), module_spec,
+              cached_module_sp, did_create_ptr);
+  if (error.Success())
+    return error;
+
+  const auto tmp_download_file_spec = JoinPath(module_spec_dir, kTempFileName);
+  error = module_downloader(module_spec, tmp_download_file_spec);
+  llvm::FileRemover tmp_file_remover(tmp_download_file_spec.GetPath());
+  if (error.Fail())
+    return Error("Failed to download module: %s", error.AsCString());
+
+  // Put downloaded file into local module cache.
+  error = Put(root_dir_spec, escaped_hostname.c_str(), module_spec,
+              tmp_download_file_spec, module_spec.GetFileSpec());
+  if (error.Fail())
+    return Error("Failed to put module into cache: %s", error.AsCString());
+
+  tmp_file_remover.releaseFile();
+  error = Get(root_dir_spec, escaped_hostname.c_str(), module_spec,
+              cached_module_sp, did_create_ptr);
+  if (error.Fail())
+    return error;
+
+  // Fetching a symbol file for the module
+  const auto tmp_download_sym_file_spec =
+      JoinPath(module_spec_dir, kTempSymFileName);
+  error = symfile_downloader(cached_module_sp, tmp_download_sym_file_spec);
+  llvm::FileRemover tmp_symfile_remover(tmp_download_sym_file_spec.GetPath());
+  if (error.Fail())
+    // Failed to download a symfile but fetching the module was successful. The
+    // module might
+    // contain the necessary symbols and the debugging is also possible without
+    // a symfile.
+    return Error();
+
+  error = Put(root_dir_spec, escaped_hostname.c_str(), module_spec,
+              tmp_download_sym_file_spec,
+              GetSymbolFileSpec(module_spec.GetFileSpec()));
+  if (error.Fail())
+    return Error("Failed to put symbol file into cache: %s", error.AsCString());
+
+  tmp_symfile_remover.releaseFile();
+
+  FileSpec symfile_spec = GetSymbolFileSpec(cached_module_sp->GetFileSpec());
+  cached_module_sp->SetSymbolFileFileSpec(symfile_spec);
+  return Error();
 }