vendor/lldb/lldb-release_39-r276489

11 files changed, 424 insertions, 86 deletions

diff --git a/source/Plugins/Platform/MacOSX/Makefile b/source/Plugins/Platform/MacOSX/Makefile
deleted file mode 100644
index 4377d369bc19..000000000000
--- a/source/Plugins/Platform/MacOSX/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-##===- source/Plugins/Platform/MacOSX/Makefile -------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LLDB_LEVEL := ../../../..
-LEVEL := $(LLDB_LEVEL)/../..
-
-include $(LEVEL)/Makefile.config
-
-SOURCES += PlatformDarwin.cpp \
-		   PlatformDarwinKernel.cpp \
-		   PlatformMacOSX.cpp \
-		   PlatformRemoteiOS.cpp \
-		   PlatformRemoteAppleTV.cpp \
-		   PlatformRemoteAppleWatch.cpp
-
-ifeq ($(HOST_OS),Darwin)
-SOURCES += PlatformAppleSimulator.cpp \
-		   PlatformiOSSimulator.cpp \
-		   PlatformiOSSimulatorCoreSimulatorSupport.mm \
-		   PlatformAppleTVSimulator.cpp \
-		   PlatformAppleWatchSimulator.cpp
-endif
-
-LIBRARYNAME := lldbPluginPlatformMacOSX
-BUILD_ARCHIVE = 1
-
-include $(LLDB_LEVEL)/Makefile
-
diff --git a/source/Plugins/Platform/MacOSX/PlatformAppleSimulator.cpp b/source/Plugins/Platform/MacOSX/PlatformAppleSimulator.cpp
index eea2844d5649..a5f165e1f925 100644
--- a/source/Plugins/Platform/MacOSX/PlatformAppleSimulator.cpp
+++ b/source/Plugins/Platform/MacOSX/PlatformAppleSimulator.cpp
@@ -252,7 +252,7 @@ FileSpec
 PlatformAppleSimulator::GetCoreSimulatorPath()
 {
 #if defined(__APPLE__)
-    Mutex::Locker locker (m_mutex);
+    std::lock_guard<std::mutex> guard(m_mutex);
     if (!m_core_simulator_framework_path.hasValue())
     {
         const char *developer_dir = GetDeveloperDirectory();
diff --git a/source/Plugins/Platform/MacOSX/PlatformAppleTVSimulator.cpp b/source/Plugins/Platform/MacOSX/PlatformAppleTVSimulator.cpp
index f537934a9172..097d58dcfbc1 100644
--- a/source/Plugins/Platform/MacOSX/PlatformAppleTVSimulator.cpp
+++ b/source/Plugins/Platform/MacOSX/PlatformAppleTVSimulator.cpp
@@ -304,7 +304,7 @@ EnumerateDirectoryCallback (void *baton, FileSpec::FileType file_type, const Fil
 const char *
 PlatformAppleTVSimulator::GetSDKDirectoryAsCString()
 {
-    Mutex::Locker locker (m_mutex);
+    std::lock_guard<std::mutex> guard(m_mutex);
     if (m_sdk_directory.empty())
     {
         const char *developer_dir = GetDeveloperDirectory();
diff --git a/source/Plugins/Platform/MacOSX/PlatformAppleWatchSimulator.cpp b/source/Plugins/Platform/MacOSX/PlatformAppleWatchSimulator.cpp
index ea8e789b2920..46e5970bc089 100644
--- a/source/Plugins/Platform/MacOSX/PlatformAppleWatchSimulator.cpp
+++ b/source/Plugins/Platform/MacOSX/PlatformAppleWatchSimulator.cpp
@@ -304,7 +304,7 @@ EnumerateDirectoryCallback (void *baton, FileSpec::FileType file_type, const Fil
 const char *
 PlatformAppleWatchSimulator::GetSDKDirectoryAsCString()
 {
-    Mutex::Locker locker (m_mutex);
+    std::lock_guard<std::mutex> guard(m_mutex);
     if (m_sdk_directory.empty())
     {
         const char *developer_dir = GetDeveloperDirectory();
diff --git a/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp b/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
index fb38630710a1..f9eada986529 100644
--- a/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
+++ b/source/Plugins/Platform/MacOSX/PlatformDarwin.cpp
@@ -583,22 +583,13 @@ PlatformDarwin::GetSharedModule (const ModuleSpec &module_spec,
 size_t
 PlatformDarwin::GetSoftwareBreakpointTrapOpcode (Target &target, BreakpointSite *bp_site)
 {
-    const uint8_t *trap_opcode = NULL;
+    const uint8_t *trap_opcode = nullptr;
     uint32_t trap_opcode_size = 0;
     bool bp_is_thumb = false;
-        
+
     llvm::Triple::ArchType machine = target.GetArchitecture().GetMachine();
     switch (machine)
     {
-    case llvm::Triple::x86:
-    case llvm::Triple::x86_64:
-        {
-            static const uint8_t g_i386_breakpoint_opcode[] = { 0xCC };
-            trap_opcode = g_i386_breakpoint_opcode;
-            trap_opcode_size = sizeof(g_i386_breakpoint_opcode);
-        }
-        break;
-
     case llvm::Triple::aarch64:
         {
             // TODO: fix this with actual darwin breakpoint opcode for arm64.
@@ -611,7 +602,8 @@ PlatformDarwin::GetSoftwareBreakpointTrapOpcode (Target &target, BreakpointSite
         break;
 
     case llvm::Triple::thumb:
-        bp_is_thumb = true; // Fall through...
+        bp_is_thumb = true;
+        LLVM_FALLTHROUGH;
     case llvm::Triple::arm:
         {
             static const uint8_t g_arm_breakpoint_opcode[] = { 0xFE, 0xDE, 0xFF, 0xE7 };
@@ -634,7 +626,7 @@ PlatformDarwin::GetSoftwareBreakpointTrapOpcode (Target &target, BreakpointSite
             trap_opcode_size = sizeof(g_arm_breakpoint_opcode);
         }
         break;
-        
+
     case llvm::Triple::ppc:
     case llvm::Triple::ppc64:
         {
@@ -643,12 +635,11 @@ PlatformDarwin::GetSoftwareBreakpointTrapOpcode (Target &target, BreakpointSite
             trap_opcode_size = sizeof(g_ppc_breakpoint_opcode);
         }
         break;
-        
+
     default:
-        assert(!"Unhandled architecture in PlatformDarwin::GetSoftwareBreakpointTrapOpcode()");
-        break;
+        return Platform::GetSoftwareBreakpointTrapOpcode(target, bp_site);
     }
-    
+
     if (trap_opcode && trap_opcode_size)
     {
         if (bp_site->SetTrapOpcode(trap_opcode, trap_opcode_size))
@@ -1024,7 +1015,7 @@ PlatformDarwin::ARMGetSupportedArchitectureAtIndex (uint32_t idx, ArchSpec &arch
 const char *
 PlatformDarwin::GetDeveloperDirectory()
 {
-    Mutex::Locker locker (m_mutex);
+    std::lock_guard<std::mutex> guard(m_mutex);
     if (m_developer_directory.empty())
     {
         bool developer_dir_path_valid = false;
@@ -1166,6 +1157,7 @@ PlatformDarwin::SetThreadCreationBreakpoint (Target &target)
                                      llvm::array_lengthof(g_bp_names),
                                      eFunctionNameTypeFull,
                                      eLanguageTypeUnknown,
+                                     0,
                                      skip_prologue,
                                      internal,
                                      hardware);
@@ -1580,10 +1572,10 @@ PlatformDarwin::AddClangModuleCompilationOptionsForSDKType (Target *target, std:
     FileSpec sysroot_spec;
     // Scope for mutex locker below
     {
-        Mutex::Locker locker (m_mutex);
+        std::lock_guard<std::mutex> guard(m_mutex);
         sysroot_spec = GetSDKDirectoryForModules(sdk_type);
     }
-    
+
     if (sysroot_spec.IsDirectory())
     {
         options.push_back("-isysroot");
@@ -1703,3 +1695,28 @@ PlatformDarwin::LocateExecutable (const char *basename)
 
     return FileSpec();
 }
+
+lldb_private::Error
+PlatformDarwin::LaunchProcess(lldb_private::ProcessLaunchInfo &launch_info)
+{
+    // Starting in Fall 2016 OSes, NSLog messages only get mirrored to stderr
+    // if the OS_ACTIVITY_DT_MODE environment variable is set.  (It doesn't
+    // require any specific value; rather, it just needs to exist).
+    // We will set it here as long as the IDE_DISABLED_OS_ACTIVITY_DT_MODE flag
+    // is not set.  Xcode makes use of IDE_DISABLED_OS_ACTIVITY_DT_MODE to tell
+    // LLDB *not* to muck with the OS_ACTIVITY_DT_MODE flag when they
+    // specifically want it unset.
+    const char *disable_env_var = "IDE_DISABLED_OS_ACTIVITY_DT_MODE";
+    auto &env_vars = launch_info.GetEnvironmentEntries();
+    if (!env_vars.ContainsEnvironmentVariable(disable_env_var))
+    {
+        // We want to make sure that OS_ACTIVITY_DT_MODE is set so that
+        // we get os_log and NSLog messages mirrored to the target process
+        // stderr.
+        if (!env_vars.ContainsEnvironmentVariable("OS_ACTIVITY_DT_MODE"))
+            env_vars.AppendArgument("OS_ACTIVITY_DT_MODE=enable");
+    }
+
+    // Let our parent class do the real launching.
+    return PlatformPOSIX::LaunchProcess(launch_info);
+}
diff --git a/source/Plugins/Platform/MacOSX/PlatformDarwin.h b/source/Plugins/Platform/MacOSX/PlatformDarwin.h
index b280b35da655..faecf4cc5a24 100644
--- a/source/Plugins/Platform/MacOSX/PlatformDarwin.h
+++ b/source/Plugins/Platform/MacOSX/PlatformDarwin.h
@@ -98,6 +98,9 @@ public:
     lldb_private::FileSpec
     LocateExecutable (const char *basename) override;
 
+    lldb_private::Error
+    LaunchProcess(lldb_private::ProcessLaunchInfo &launch_info) override;
+
 protected:
     void
     ReadLibdispatchOffsetsAddress (lldb_private::Process *process);
diff --git a/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp b/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
index a502aa03eb26..d3c1c805a83b 100644
--- a/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
+++ b/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
@@ -30,6 +30,7 @@
 #include "lldb/Interpreter/OptionValueFileSpecList.h"
 #include "lldb/Interpreter/OptionValueProperties.h"
 #include "lldb/Interpreter/Property.h"
+#include "lldb/Symbol/ObjectFile.h"
 #include "lldb/Target/Platform.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/Target.h"
@@ -881,12 +882,24 @@ PlatformDarwinKernel::GetSharedModule (const ModuleSpec &module_spec,
                 ModuleSP module_sp (new Module (kern_spec));
                 if (module_sp && module_sp->GetObjectFile() && module_sp->MatchesModuleSpec (kern_spec))
                 {
-                    Error error;
-                    error = ModuleList::GetSharedModule (kern_spec, module_sp, NULL, NULL, NULL);
-                    if (module_sp && module_sp->GetObjectFile())
+                    // module_sp is an actual kernel binary we want to add.
+                    if (process)
                     {
+                        process->GetTarget().GetImages().AppendIfNeeded (module_sp);
+                        error.Clear();
                         return error;
                     }
+                    else
+                    {
+                        error = ModuleList::GetSharedModule (kern_spec, module_sp, NULL, NULL, NULL);
+                        if (module_sp 
+                            && module_sp->GetObjectFile() 
+                            && module_sp->GetObjectFile()->GetType() != ObjectFile::Type::eTypeCoreFile)
+                        {
+                            return error;
+                        }
+                        module_sp.reset();
+                    }
                 }
             }
         }
diff --git a/source/Plugins/Platform/MacOSX/PlatformRemoteAppleTV.cpp b/source/Plugins/Platform/MacOSX/PlatformRemoteAppleTV.cpp
index 04231f27ff9b..30af2bb2250b 100644
--- a/source/Plugins/Platform/MacOSX/PlatformRemoteAppleTV.cpp
+++ b/source/Plugins/Platform/MacOSX/PlatformRemoteAppleTV.cpp
@@ -158,14 +158,6 @@ PlatformRemoteAppleTV::CreateInstance (bool force, const ArchSpec *arch)
                         case llvm::Triple::TvOS:     // This is the right triple value for Apple TV debugging
                             break;
 
-#if defined(__APPLE__)
-                        // Only accept "unknown" for the OS if the host is Apple and
-                        // it "unknown" wasn't specified (it was just returned because it
-                        // was NOT specified)
-                        case llvm::Triple::UnknownOS:
-                            create = !arch->TripleOSWasSpecified();
-                            break;
-#endif
                         default:
                             create = false;
                             break;
@@ -314,9 +306,14 @@ PlatformRemoteAppleTV::GetContainedFilesIntoVectorOfStringsCallback (void *baton
 bool
 PlatformRemoteAppleTV::UpdateSDKDirectoryInfosIfNeeded()
 {
+    Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
     if (m_sdk_directory_infos.empty())
     {
         const char *device_support_dir = GetDeviceSupportDirectory();
+        if (log)
+        {
+            log->Printf ("PlatformRemoteAppleTV::UpdateSDKDirectoryInfosIfNeeded Got DeviceSupport directory %s", device_support_dir);
+        }
         if (device_support_dir)
         {
             const bool find_directories = true;
@@ -341,12 +338,20 @@ PlatformRemoteAppleTV::UpdateSDKDirectoryInfosIfNeeded()
                 if (sdk_symbols_symlink_fspec.Exists())
                 {
                     m_sdk_directory_infos.push_back(sdk_directory_info);
+                    if (log)
+                    {
+                        log->Printf ("PlatformRemoteAppleTV::UpdateSDKDirectoryInfosIfNeeded added builtin SDK directory %s", sdk_symbols_symlink_fspec.GetPath().c_str());
+                    }
                 }
                 else
                 {
                     sdk_symbols_symlink_fspec.GetFilename().SetCString("Symbols");
                     if (sdk_symbols_symlink_fspec.Exists())
                         m_sdk_directory_infos.push_back(sdk_directory_info);
+                    if (log)
+                    {
+                        log->Printf ("PlatformRemoteAppleTV::UpdateSDKDirectoryInfosIfNeeded added builtin SDK directory %s", sdk_symbols_symlink_fspec.GetPath().c_str());
+                    }
                 }
             }
 
@@ -374,6 +379,10 @@ PlatformRemoteAppleTV::UpdateSDKDirectoryInfosIfNeeded()
             }
             if (local_sdk_cache.Exists())
             {
+                if (log)
+                {
+                    log->Printf ("PlatformRemoteAppleTV::UpdateSDKDirectoryInfosIfNeeded searching %s for additional SDKs", local_sdk_cache.GetPath().c_str());
+                }
                 char path[PATH_MAX];
                 if (local_sdk_cache.GetPath(path, sizeof(path)))
                 {
@@ -388,6 +397,10 @@ PlatformRemoteAppleTV::UpdateSDKDirectoryInfosIfNeeded()
                     for (uint32_t i=num_installed; i<num_sdk_infos; ++i)
                     {
                         m_sdk_directory_infos[i].user_cached = true;
+                        if (log)
+                        {
+                            log->Printf ("PlatformRemoteAppleTV::UpdateSDKDirectoryInfosIfNeeded user SDK directory %s", m_sdk_directory_infos[i].directory.GetPath().c_str());
+                        }
                     }
                 }
             }
@@ -572,6 +585,7 @@ uint32_t
 PlatformRemoteAppleTV::FindFileInAllSDKs (const char *platform_file_path,
                                       FileSpecList &file_list)
 {
+    Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST | LIBLLDB_LOG_VERBOSE);
     if (platform_file_path && platform_file_path[0] && UpdateSDKDirectoryInfosIfNeeded())
     {
         const uint32_t num_sdk_infos = m_sdk_directory_infos.size();
@@ -579,6 +593,10 @@ PlatformRemoteAppleTV::FindFileInAllSDKs (const char *platform_file_path,
         // First try for an exact match of major, minor and update
         for (uint32_t sdk_idx=0; sdk_idx<num_sdk_infos; ++sdk_idx)
         {
+            if (log)
+            {
+                log->Printf ("Searching for %s in sdk path %s", platform_file_path, m_sdk_directory_infos[sdk_idx].directory.GetPath().c_str());
+            }
             if (GetFileInSDK (platform_file_path,
                               sdk_idx,
                               local_file))
@@ -618,6 +636,7 @@ PlatformRemoteAppleTV::GetFileInSDKRoot (const char *platform_file_path,
                                      bool symbols_dirs_only,
                                      lldb_private::FileSpec &local_file)
 {
+    Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
     if (sdkroot_path && sdkroot_path[0] && platform_file_path && platform_file_path[0])
     {
         char resolved_path[PATH_MAX];
@@ -632,7 +651,13 @@ PlatformRemoteAppleTV::GetFileInSDKRoot (const char *platform_file_path,
             
             local_file.SetFile(resolved_path, true);
             if (local_file.Exists())
+            {
+                if (log)
+                {
+                    log->Printf ("Found a copy of %s in the SDK dir %s", platform_file_path, sdkroot_path);
+                }
                 return true;
+            }
         }
             
         ::snprintf (resolved_path,
@@ -643,7 +668,13 @@ PlatformRemoteAppleTV::GetFileInSDKRoot (const char *platform_file_path,
         
         local_file.SetFile(resolved_path, true);
         if (local_file.Exists())
+        {
+            if (log)
+            {
+                log->Printf ("Found a copy of %s in the SDK dir %s/Symbols.Internal", platform_file_path, sdkroot_path);
+            }
             return true;
+        }
         ::snprintf (resolved_path,
                     sizeof(resolved_path), 
                     "%s/Symbols%s", 
@@ -652,7 +683,13 @@ PlatformRemoteAppleTV::GetFileInSDKRoot (const char *platform_file_path,
         
         local_file.SetFile(resolved_path, true);
         if (local_file.Exists())
+        {
+            if (log)
+            {
+                log->Printf ("Found a copy of %s in the SDK dir %s/Symbols", platform_file_path, sdkroot_path);
+            }
             return true;                
+        }
     }
     return false;
 }
@@ -662,6 +699,7 @@ PlatformRemoteAppleTV::GetSymbolFile (const FileSpec &platform_file,
                                   const UUID *uuid_ptr,
                                   FileSpec &local_file)
 {
+    Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
     Error error;
     char platform_file_path[PATH_MAX];
     if (platform_file.GetPath(platform_file_path, sizeof(platform_file_path)))
@@ -679,7 +717,13 @@ PlatformRemoteAppleTV::GetSymbolFile (const FileSpec &platform_file,
             
             local_file.SetFile(resolved_path, true);
             if (local_file.Exists())
+            {
+                if (log)
+                {
+                    log->Printf ("Found a copy of %s in the DeviceSupport dir %s", platform_file_path, os_version_dir);
+                }
                 return error;
+            }
 
             ::snprintf (resolved_path, 
                         sizeof(resolved_path), 
@@ -689,7 +733,13 @@ PlatformRemoteAppleTV::GetSymbolFile (const FileSpec &platform_file,
 
             local_file.SetFile(resolved_path, true);
             if (local_file.Exists())
+            {
+                if (log)
+                {
+                    log->Printf ("Found a copy of %s in the DeviceSupport dir %s/Symbols.Internal", platform_file_path, os_version_dir);
+                }
                 return error;
+            }
             ::snprintf (resolved_path, 
                         sizeof(resolved_path), 
                         "%s/Symbols/%s", 
@@ -698,8 +748,13 @@ PlatformRemoteAppleTV::GetSymbolFile (const FileSpec &platform_file,
 
             local_file.SetFile(resolved_path, true);
             if (local_file.Exists())
+            {
+                if (log)
+                {
+                    log->Printf ("Found a copy of %s in the DeviceSupport dir %s/Symbols", platform_file_path, os_version_dir);
+                }
                 return error;
-
+            }
         }
         local_file = platform_file;
         if (local_file.Exists())
@@ -729,6 +784,7 @@ PlatformRemoteAppleTV::GetSharedModule (const ModuleSpec &module_spec,
     // then we attempt to get a shared module for the right architecture
     // with the right UUID.
     const FileSpec &platform_file = module_spec.GetFileSpec();
+    Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST | LIBLLDB_LOG_VERBOSE);
 
     Error error;
     char platform_file_path[PATH_MAX];
@@ -746,6 +802,10 @@ PlatformRemoteAppleTV::GetSharedModule (const ModuleSpec &module_spec,
         const uint32_t connected_sdk_idx = GetConnectedSDKIndex ();
         if (connected_sdk_idx < num_sdk_infos)
         {
+            if (log)
+            {
+                log->Printf ("Searching for %s in sdk path %s", platform_file_path, m_sdk_directory_infos[connected_sdk_idx].directory.GetPath().c_str());
+            }
             if (GetFileInSDK (platform_file_path, connected_sdk_idx, platform_module_spec.GetFileSpec()))
             {
                 module_sp.reset();
@@ -765,6 +825,10 @@ PlatformRemoteAppleTV::GetSharedModule (const ModuleSpec &module_spec,
         // will tend to be valid in that same SDK.
         if (m_last_module_sdk_idx < num_sdk_infos)
         {
+            if (log)
+            {
+                log->Printf ("Searching for %s in sdk path %s", platform_file_path, m_sdk_directory_infos[m_last_module_sdk_idx].directory.GetPath().c_str());
+            }
             if (GetFileInSDK (platform_file_path, m_last_module_sdk_idx, platform_module_spec.GetFileSpec()))
             {
                 module_sp.reset();
@@ -788,6 +852,10 @@ PlatformRemoteAppleTV::GetSharedModule (const ModuleSpec &module_spec,
                 // it above
                 continue;
             }
+            if (log)
+            {
+                log->Printf ("Searching for %s in sdk path %s", platform_file_path, m_sdk_directory_infos[sdk_idx].directory.GetPath().c_str());
+            }
             if (GetFileInSDK (platform_file_path, sdk_idx, platform_module_spec.GetFileSpec()))
             {
                 //printf ("sdk[%u]: '%s'\n", sdk_idx, local_file.GetPath().c_str());
@@ -812,6 +880,76 @@ PlatformRemoteAppleTV::GetSharedModule (const ModuleSpec &module_spec,
     if (error.Success())
         return error;
 
+    // See if the file is present in any of the module_search_paths_ptr directories.
+    if (!module_sp && module_search_paths_ptr && platform_file)
+    {
+        // create a vector of all the file / directory names in platform_file
+        // e.g. this might be /System/Library/PrivateFrameworks/UIFoundation.framework/UIFoundation
+        //
+        // We'll need to look in the module_search_paths_ptr directories for
+        // both "UIFoundation" and "UIFoundation.framework" -- most likely the
+        // latter will be the one we find there.
+
+        FileSpec platform_pull_apart (platform_file);
+        std::vector<std::string> path_parts;
+        ConstString unix_root_dir("/");
+        while (true)
+        {
+            ConstString part = platform_pull_apart.GetLastPathComponent();
+            platform_pull_apart.RemoveLastPathComponent();
+            if (part.IsEmpty() || part == unix_root_dir)
+                break;
+            path_parts.push_back (part.AsCString());
+        }
+        const size_t path_parts_size = path_parts.size(); 
+
+        size_t num_module_search_paths = module_search_paths_ptr->GetSize();
+        for (size_t i = 0; i < num_module_search_paths; ++i)
+        {
+            // Create a new FileSpec with this module_search_paths_ptr
+            // plus just the filename ("UIFoundation"), then the parent 
+            // dir plus filename ("UIFoundation.framework/UIFoundation")
+            // etc - up to four names (to handle "Foo.framework/Contents/MacOS/Foo")
+
+            for (size_t j = 0; j < 4 && j < path_parts_size - 1; ++j)
+            {
+                FileSpec path_to_try (module_search_paths_ptr->GetFileSpecAtIndex (i));
+
+                // Add the components backwards.  For .../PrivateFrameworks/UIFoundation.framework/UIFoundation
+                // path_parts is
+                //   [0] UIFoundation
+                //   [1] UIFoundation.framework
+                //   [2] PrivateFrameworks
+                //
+                // and if 'j' is 2, we want to append path_parts[1] and then path_parts[0], aka
+                // 'UIFoundation.framework/UIFoundation', to the module_search_paths_ptr path.
+
+                for (int k = j; k >= 0; --k)
+                {
+                    path_to_try.AppendPathComponent (path_parts[k]);
+                }
+
+                if (path_to_try.Exists())
+                {
+                    ModuleSpec new_module_spec (module_spec);
+                    new_module_spec.GetFileSpec() = path_to_try;
+                    Error new_error (Platform::GetSharedModule (new_module_spec,
+                                                                process,
+                                                                module_sp,
+                                                                NULL,
+                                                                old_module_sp_ptr,
+                                                                did_create_ptr));
+                    
+                    if (module_sp)
+                    {
+                        module_sp->SetPlatformFileSpec (path_to_try);
+                        return new_error;
+                    }
+                }
+            }
+        }
+    }
+
     const bool always_create = false;
     error = ModuleList::GetSharedModule (module_spec,
                                          module_sp,
diff --git a/source/Plugins/Platform/MacOSX/PlatformRemoteAppleWatch.cpp b/source/Plugins/Platform/MacOSX/PlatformRemoteAppleWatch.cpp
index 808fd96a5284..ba59887ccf27 100644
--- a/source/Plugins/Platform/MacOSX/PlatformRemoteAppleWatch.cpp
+++ b/source/Plugins/Platform/MacOSX/PlatformRemoteAppleWatch.cpp
@@ -158,14 +158,6 @@ PlatformRemoteAppleWatch::CreateInstance (bool force, const ArchSpec *arch)
                         case llvm::Triple::WatchOS:     // This is the right triple value for Apple Watch debugging
                             break;
 
-#if defined(__APPLE__)
-                        // Only accept "unknown" for the OS if the host is Apple and
-                        // it "unknown" wasn't specified (it was just returned because it
-                        // was NOT specified)
-                        case llvm::Triple::UnknownOS:
-                            create = !arch->TripleOSWasSpecified();
-                            break;
-#endif
                         default:
                             create = false;
                             break;
@@ -322,9 +314,14 @@ PlatformRemoteAppleWatch::GetContainedFilesIntoVectorOfStringsCallback (void *ba
 bool
 PlatformRemoteAppleWatch::UpdateSDKDirectoryInfosIfNeeded()
 {
+    Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
     if (m_sdk_directory_infos.empty())
     {
         const char *device_support_dir = GetDeviceSupportDirectory();
+        if (log)
+        {
+            log->Printf ("PlatformRemoteAppleWatch::UpdateSDKDirectoryInfosIfNeeded Got DeviceSupport directory %s", device_support_dir);
+        }
         if (device_support_dir)
         {
             const bool find_directories = true;
@@ -349,12 +346,20 @@ PlatformRemoteAppleWatch::UpdateSDKDirectoryInfosIfNeeded()
                 if (sdk_symbols_symlink_fspec.Exists())
                 {
                     m_sdk_directory_infos.push_back(sdk_directory_info);
+                    if (log)
+                    {
+                        log->Printf ("PlatformRemoteAppleWatch::UpdateSDKDirectoryInfosIfNeeded added builtin SDK directory %s", sdk_symbols_symlink_fspec.GetPath().c_str());
+                    }
                 }
                 else
                 {
                     sdk_symbols_symlink_fspec.GetFilename().SetCString("Symbols");
                     if (sdk_symbols_symlink_fspec.Exists())
                         m_sdk_directory_infos.push_back(sdk_directory_info);
+                    if (log)
+                    {
+                        log->Printf ("PlatformRemoteAppleWatch::UpdateSDKDirectoryInfosIfNeeded added builtin SDK directory %s", sdk_symbols_symlink_fspec.GetPath().c_str());
+                    }
                 }
             }
 
@@ -374,6 +379,10 @@ PlatformRemoteAppleWatch::UpdateSDKDirectoryInfosIfNeeded()
             }
             if (local_sdk_cache.Exists())
             {
+                if (log)
+                {
+                    log->Printf ("PlatformRemoteAppleWatch::UpdateSDKDirectoryInfosIfNeeded searching %s for additional SDKs", local_sdk_cache.GetPath().c_str());
+                }
                 char path[PATH_MAX];
                 if (local_sdk_cache.GetPath(path, sizeof(path)))
                 {
@@ -388,6 +397,10 @@ PlatformRemoteAppleWatch::UpdateSDKDirectoryInfosIfNeeded()
                     for (uint32_t i=num_installed; i<num_sdk_infos; ++i)
                     {
                         m_sdk_directory_infos[i].user_cached = true;
+                        if (log)
+                        {
+                            log->Printf ("PlatformRemoteAppleWatch::UpdateSDKDirectoryInfosIfNeeded user SDK directory %s", m_sdk_directory_infos[i].directory.GetPath().c_str());
+                        }
                     }
                 }
             }
@@ -583,6 +596,7 @@ uint32_t
 PlatformRemoteAppleWatch::FindFileInAllSDKs (const char *platform_file_path,
                                       FileSpecList &file_list)
 {
+    Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST | LIBLLDB_LOG_VERBOSE);
     if (platform_file_path && platform_file_path[0] && UpdateSDKDirectoryInfosIfNeeded())
     {
         const uint32_t num_sdk_infos = m_sdk_directory_infos.size();
@@ -590,6 +604,10 @@ PlatformRemoteAppleWatch::FindFileInAllSDKs (const char *platform_file_path,
         // First try for an exact match of major, minor and update
         for (uint32_t sdk_idx=0; sdk_idx<num_sdk_infos; ++sdk_idx)
         {
+            if (log)
+            {
+                log->Printf ("Searching for %s in sdk path %s", platform_file_path, m_sdk_directory_infos[sdk_idx].directory.GetPath().c_str());
+            }
             if (GetFileInSDK (platform_file_path,
                               sdk_idx,
                               local_file))
@@ -629,6 +647,7 @@ PlatformRemoteAppleWatch::GetFileInSDKRoot (const char *platform_file_path,
                                      bool symbols_dirs_only,
                                      lldb_private::FileSpec &local_file)
 {
+    Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
     if (sdkroot_path && sdkroot_path[0] && platform_file_path && platform_file_path[0])
     {
         char resolved_path[PATH_MAX];
@@ -643,7 +662,13 @@ PlatformRemoteAppleWatch::GetFileInSDKRoot (const char *platform_file_path,
             
             local_file.SetFile(resolved_path, true);
             if (local_file.Exists())
+            {
+                if (log)
+                {
+                    log->Printf ("Found a copy of %s in the SDK dir %s", platform_file_path, sdkroot_path);
+                }
                 return true;
+            }
         }
             
         ::snprintf (resolved_path,
@@ -654,7 +679,13 @@ PlatformRemoteAppleWatch::GetFileInSDKRoot (const char *platform_file_path,
         
         local_file.SetFile(resolved_path, true);
         if (local_file.Exists())
+        {
+            if (log)
+            {
+                log->Printf ("Found a copy of %s in the SDK dir %s/Symbols.Internal", platform_file_path, sdkroot_path);
+            }
             return true;
+        }
         ::snprintf (resolved_path,
                     sizeof(resolved_path), 
                     "%s/Symbols%s", 
@@ -663,7 +694,13 @@ PlatformRemoteAppleWatch::GetFileInSDKRoot (const char *platform_file_path,
         
         local_file.SetFile(resolved_path, true);
         if (local_file.Exists())
+        {
+            if (log)
+            {
+                log->Printf ("Found a copy of %s in the SDK dir %s/Symbols", platform_file_path, sdkroot_path);
+            }
             return true;                
+        }
     }
     return false;
 }
@@ -673,6 +710,7 @@ PlatformRemoteAppleWatch::GetSymbolFile (const FileSpec &platform_file,
                                   const UUID *uuid_ptr,
                                   FileSpec &local_file)
 {
+    Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST);
     Error error;
     char platform_file_path[PATH_MAX];
     if (platform_file.GetPath(platform_file_path, sizeof(platform_file_path)))
@@ -690,7 +728,13 @@ PlatformRemoteAppleWatch::GetSymbolFile (const FileSpec &platform_file,
             
             local_file.SetFile(resolved_path, true);
             if (local_file.Exists())
+            {
+                if (log)
+                {
+                    log->Printf ("Found a copy of %s in the DeviceSupport dir %s", platform_file_path, os_version_dir);
+                }
                 return error;
+            }
 
             ::snprintf (resolved_path, 
                         sizeof(resolved_path), 
@@ -700,7 +744,13 @@ PlatformRemoteAppleWatch::GetSymbolFile (const FileSpec &platform_file,
 
             local_file.SetFile(resolved_path, true);
             if (local_file.Exists())
+            {
+                if (log)
+                {
+                    log->Printf ("Found a copy of %s in the DeviceSupport dir %s/Symbols.Internal", platform_file_path, os_version_dir);
+                }
                 return error;
+            }
             ::snprintf (resolved_path, 
                         sizeof(resolved_path), 
                         "%s/Symbols/%s", 
@@ -709,7 +759,13 @@ PlatformRemoteAppleWatch::GetSymbolFile (const FileSpec &platform_file,
 
             local_file.SetFile(resolved_path, true);
             if (local_file.Exists())
+            {
+                if (log)
+                {
+                    log->Printf ("Found a copy of %s in the DeviceSupport dir %s/Symbols", platform_file_path, os_version_dir);
+                }
                 return error;
+            }
 
         }
         local_file = platform_file;
@@ -740,6 +796,7 @@ PlatformRemoteAppleWatch::GetSharedModule (const ModuleSpec &module_spec,
     // then we attempt to get a shared module for the right architecture
     // with the right UUID.
     const FileSpec &platform_file = module_spec.GetFileSpec();
+    Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST | LIBLLDB_LOG_VERBOSE);
 
     Error error;
     char platform_file_path[PATH_MAX];
@@ -757,6 +814,10 @@ PlatformRemoteAppleWatch::GetSharedModule (const ModuleSpec &module_spec,
         const uint32_t connected_sdk_idx = GetConnectedSDKIndex ();
         if (connected_sdk_idx < num_sdk_infos)
         {
+            if (log)
+            {
+                log->Printf ("Searching for %s in sdk path %s", platform_file_path, m_sdk_directory_infos[connected_sdk_idx].directory.GetPath().c_str());
+            }
             if (GetFileInSDK (platform_file_path, connected_sdk_idx, platform_module_spec.GetFileSpec()))
             {
                 module_sp.reset();
@@ -776,6 +837,10 @@ PlatformRemoteAppleWatch::GetSharedModule (const ModuleSpec &module_spec,
         // will tend to be valid in that same SDK.
         if (m_last_module_sdk_idx < num_sdk_infos)
         {
+            if (log)
+            {
+                log->Printf ("Searching for %s in sdk path %s", platform_file_path, m_sdk_directory_infos[m_last_module_sdk_idx].directory.GetPath().c_str());
+            }
             if (GetFileInSDK (platform_file_path, m_last_module_sdk_idx, platform_module_spec.GetFileSpec()))
             {
                 module_sp.reset();
@@ -799,6 +864,10 @@ PlatformRemoteAppleWatch::GetSharedModule (const ModuleSpec &module_spec,
                 // it above
                 continue;
             }
+            if (log)
+            {
+                log->Printf ("Searching for %s in sdk path %s", platform_file_path, m_sdk_directory_infos[sdk_idx].directory.GetPath().c_str());
+            }
             if (GetFileInSDK (platform_file_path, sdk_idx, platform_module_spec.GetFileSpec()))
             {
                 //printf ("sdk[%u]: '%s'\n", sdk_idx, local_file.GetPath().c_str());
@@ -823,6 +892,76 @@ PlatformRemoteAppleWatch::GetSharedModule (const ModuleSpec &module_spec,
     if (error.Success())
         return error;
 
+    // See if the file is present in any of the module_search_paths_ptr directories.
+    if (!module_sp && module_search_paths_ptr && platform_file)
+    {
+        // create a vector of all the file / directory names in platform_file
+        // e.g. this might be /System/Library/PrivateFrameworks/UIFoundation.framework/UIFoundation
+        //
+        // We'll need to look in the module_search_paths_ptr directories for
+        // both "UIFoundation" and "UIFoundation.framework" -- most likely the
+        // latter will be the one we find there.
+
+        FileSpec platform_pull_apart (platform_file);
+        std::vector<std::string> path_parts;
+        ConstString unix_root_dir("/");
+        while (true)
+        {
+            ConstString part = platform_pull_apart.GetLastPathComponent();
+            platform_pull_apart.RemoveLastPathComponent();
+            if (part.IsEmpty() || part == unix_root_dir)
+                break;
+            path_parts.push_back (part.AsCString());
+        }
+        const size_t path_parts_size = path_parts.size(); 
+
+        size_t num_module_search_paths = module_search_paths_ptr->GetSize();
+        for (size_t i = 0; i < num_module_search_paths; ++i)
+        {
+            // Create a new FileSpec with this module_search_paths_ptr
+            // plus just the filename ("UIFoundation"), then the parent 
+            // dir plus filename ("UIFoundation.framework/UIFoundation")
+            // etc - up to four names (to handle "Foo.framework/Contents/MacOS/Foo")
+
+            for (size_t j = 0; j < 4 && j < path_parts_size - 1; ++j)
+            {
+                FileSpec path_to_try (module_search_paths_ptr->GetFileSpecAtIndex (i));
+
+                // Add the components backwards.  For .../PrivateFrameworks/UIFoundation.framework/UIFoundation
+                // path_parts is
+                //   [0] UIFoundation
+                //   [1] UIFoundation.framework
+                //   [2] PrivateFrameworks
+                //
+                // and if 'j' is 2, we want to append path_parts[1] and then path_parts[0], aka
+                // 'UIFoundation.framework/UIFoundation', to the module_search_paths_ptr path.
+
+                for (int k = j; k >= 0; --k)
+                {
+                    path_to_try.AppendPathComponent (path_parts[k]);
+                }
+
+                if (path_to_try.Exists())
+                {
+                    ModuleSpec new_module_spec (module_spec);
+                    new_module_spec.GetFileSpec() = path_to_try;
+                    Error new_error (Platform::GetSharedModule (new_module_spec,
+                                                                process,
+                                                                module_sp,
+                                                                NULL,
+                                                                old_module_sp_ptr,
+                                                                did_create_ptr));
+                    
+                    if (module_sp)
+                    {
+                        module_sp->SetPlatformFileSpec (path_to_try);
+                        return new_error;
+                    }
+                }
+            }
+        }
+    }
+
     const bool always_create = false;
     error = ModuleList::GetSharedModule (module_spec,
                                          module_sp,
diff --git a/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp b/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
index 75afa9019dcd..abc429a72345 100644
--- a/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
+++ b/source/Plugins/Platform/MacOSX/PlatformRemoteiOS.cpp
@@ -142,14 +142,6 @@ PlatformRemoteiOS::CreateInstance (bool force, const ArchSpec *arch)
                         case llvm::Triple::IOS:     // This is the right triple value for iOS debugging
                             break;
 
-#if defined(__APPLE__)
-                        // Only accept "unknown" for the OS if the host is Apple and
-                        // it "unknown" wasn't specified (it was just returned because it
-                        // was NOT specified)
-                        case llvm::Triple::UnknownOS:
-                            create = !arch->TripleOSWasSpecified();
-                            break;
-#endif
                         default:
                             create = false;
                             break;
@@ -913,6 +905,76 @@ PlatformRemoteiOS::GetSharedModule (const ModuleSpec &module_spec,
     if (error.Success())
         return error;
 
+    // See if the file is present in any of the module_search_paths_ptr directories.
+    if (!module_sp && module_search_paths_ptr && platform_file)
+    {
+        // create a vector of all the file / directory names in platform_file
+        // e.g. this might be /System/Library/PrivateFrameworks/UIFoundation.framework/UIFoundation
+        //
+        // We'll need to look in the module_search_paths_ptr directories for
+        // both "UIFoundation" and "UIFoundation.framework" -- most likely the
+        // latter will be the one we find there.
+
+        FileSpec platform_pull_apart (platform_file);
+        std::vector<std::string> path_parts;
+        ConstString unix_root_dir("/");
+        while (true)
+        {
+            ConstString part = platform_pull_apart.GetLastPathComponent();
+            platform_pull_apart.RemoveLastPathComponent();
+            if (part.IsEmpty() || part == unix_root_dir)
+                break;
+            path_parts.push_back (part.AsCString());
+        }
+        const size_t path_parts_size = path_parts.size(); 
+
+        size_t num_module_search_paths = module_search_paths_ptr->GetSize();
+        for (size_t i = 0; i < num_module_search_paths; ++i)
+        {
+            // Create a new FileSpec with this module_search_paths_ptr
+            // plus just the filename ("UIFoundation"), then the parent 
+            // dir plus filename ("UIFoundation.framework/UIFoundation")
+            // etc - up to four names (to handle "Foo.framework/Contents/MacOS/Foo")
+
+            for (size_t j = 0; j < 4 && j < path_parts_size - 1; ++j)
+            {
+                FileSpec path_to_try (module_search_paths_ptr->GetFileSpecAtIndex (i));
+
+                // Add the components backwards.  For .../PrivateFrameworks/UIFoundation.framework/UIFoundation
+                // path_parts is
+                //   [0] UIFoundation
+                //   [1] UIFoundation.framework
+                //   [2] PrivateFrameworks
+                //
+                // and if 'j' is 2, we want to append path_parts[1] and then path_parts[0], aka
+                // 'UIFoundation.framework/UIFoundation', to the module_search_paths_ptr path.
+
+                for (int k = j; k >= 0; --k)
+                {
+                    path_to_try.AppendPathComponent (path_parts[k]);
+                }
+
+                if (path_to_try.Exists())
+                {
+                    ModuleSpec new_module_spec (module_spec);
+                    new_module_spec.GetFileSpec() = path_to_try;
+                    Error new_error (Platform::GetSharedModule (new_module_spec,
+                                                                process,
+                                                                module_sp,
+                                                                NULL,
+                                                                old_module_sp_ptr,
+                                                                did_create_ptr));
+                    
+                    if (module_sp)
+                    {
+                        module_sp->SetPlatformFileSpec (path_to_try);
+                        return new_error;
+                    }
+                }
+            }
+        }
+    }
+
     const bool always_create = false;
     error = ModuleList::GetSharedModule (module_spec,
                                          module_sp,
diff --git a/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp b/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp
index cbe9c7949a4a..99b9324417b5 100644
--- a/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp
+++ b/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp
@@ -308,7 +308,7 @@ EnumerateDirectoryCallback (void *baton, FileSpec::FileType file_type, const Fil
 const char *
 PlatformiOSSimulator::GetSDKDirectoryAsCString()
 {
-    Mutex::Locker locker (m_mutex);
+    std::lock_guard<std::mutex> guard(m_mutex);
     if (m_sdk_directory.empty())
     {
         const char *developer_dir = GetDeveloperDirectory();