Repair support for launching iphone/tv/watch simulator binaries through platform

[aprantl]

Summary

and delete a bunch (but not all) redundant code. If you compare the remaining implementations of Platform*Simulator.cpp, there is still an obvious leftover cleanup task.

Specifically, this patch

• removes SDK initialization from dotest (there is equivalent but more complete code in Makefile.rules)
• make Platform*Simulator inherit the generic implementation of PlatformAppleSimulator (more can be done here)
• simplify the platform logic in Makefile.rules
• replace the custom SDK finding logic in Platform*Simulator with XcodeSDK
• adds a test for each supported simulator

[aprantl]

Fix decorator usage.

[aprantl]

Fix fallout from the Makefile.rules change by adapting a handful of manually written Makefiles.

[vsk]

Generally this looks really nice!

lldb/packages/Python/lldbsuite/test/make/Makefile.rules

135

If I've read this correctly, this means we'll only sign when TRIPLE_OS == "macosx" && TRIPLE_ENV == "". Is that what we want, or should we be signing everything?

143

Can we just write xcrun --sdk $(SDK_NAME) --show-sdk-version?

If not, is the "-e" option to grep redundant, since there's only one pattern to match?

[aprantl]

Simplify version detection.

[aprantl]

lldb/packages/Python/lldbsuite/test/make/Makefile.rules

135

This is preserving the old behavior, and IIUC code signing on macOS is just slowing things down with no advantage.

143

Yes, that's nicer!

[aprantl]

Actually update the patch and not the diff from my previous patch.

[vsk]

lldb/packages/Python/lldbsuite/test/make/Makefile.rules

135

Oh I see. We actually need this change to make sure things for watch/tv get signed. Earlier, I misread ifneq "$(TRIPLE_OS)" "macosx" as ifeq "$(TRIPLE_OS)" "macosx".

lldb/packages/Python/lldbsuite/test/dotest.py

def parseOptionsAndInitTestdirs():
     # Set SDKROOT if we are using an Apple SDK
     if platform_system == 'Darwin' and args.apple_sdk:
         configuration.sdkroot = seven.get_command_output(
             'xcrun --sdk "%s" --show-sdk-path 2> /dev/null' %
             (args.apple_sdk))
 
     if args.arch:
         configuration.arch = args.arch
-        if configuration.arch.startswith(
-                'arm') and platform_system == 'Darwin' and not args.apple_sdk:
-            configuration.sdkroot = seven.get_command_output(
-                'xcrun --sdk iphoneos.internal --show-sdk-path 2> /dev/null')
-            if not os.path.exists(configuration.sdkroot):
-                configuration.sdkroot = seven.get_command_output(
-                    'xcrun --sdk iphoneos --show-sdk-path 2> /dev/null')
     else:
         configuration.arch = platform_machine
 
     if args.categories_list:
         configuration.categories_list = set(
             test_categories.validate(
                 args.categories_list, False))
         configuration.use_categories = True

lldb/packages/Python/lldbsuite/test/dotest_args.py

group.add_argument(
         '-A',
         '--arch',
         metavar='arch',
         dest='arch',
         help=textwrap.dedent('''Specify the architecture(s) to test. This option can be specified more than once'''))
     group.add_argument('-C', '--compiler', metavar='compiler', dest='compiler', help=textwrap.dedent(
         '''Specify the compiler(s) used to build the inferior executables. The compiler path can be an executable basename or a full path to a compiler executable. This option can be specified multiple times.'''))
     if sys.platform == 'darwin':
-        group.add_argument('--apple-sdk', metavar='apple_sdk', dest='apple_sdk', default="macosx", help=textwrap.dedent(
+        group.add_argument('--apple-sdk', metavar='apple_sdk', dest='apple_sdk', default="", help=textwrap.dedent(
             '''Specify the name of the Apple SDK (macosx, macosx.internal, iphoneos, iphoneos.internal, or path to SDK) and use the appropriate tools from that SDK's toolchain.'''))
     # FIXME? This won't work for different extra flags according to each arch.
     group.add_argument(
         '-E',
         metavar='extra-flags',
         help=textwrap.dedent('''Specify the extra flags to be passed to the toolchain when building the inferior programs to be debugged
                                                            suggestions: do not lump the "-A arch1 -A arch2" together such that the -E option applies to only one of the architectures'''))
 

lldb/packages/Python/lldbsuite/test/make/Makefile.rules

ifneq "$(TRIPLE)" ""
   ARCH =$(word 1, $(triple_space))
   TRIPLE_VENDOR =$(word 2, $(triple_space))
   triple_os_and_version =$(shell echo $(word 3, $(triple_space)) | sed 's/\([a-z]*\)\(.*\)/\1 \2/')
   TRIPLE_OS =$(word 1, $(triple_os_and_version))
   TRIPLE_VERSION =$(word 2, $(triple_os_and_version))
   TRIPLE_ENV =$(word 4, $(triple_space))
   ifeq "$(TRIPLE_VENDOR)" "apple"
     ifeq "$(TRIPLE_OS)" "ios"
-      CODESIGN := codesign
-      ifeq "$(SDKROOT)" ""
-        # Set SDKROOT if it wasn't set
-        ifneq (,$(findstring arm,$(ARCH)))
-          SDKROOT = $(shell xcrun --sdk iphoneos --show-sdk-path)
-          ifeq "$(TRIPLE_VERSION)" ""
-            TRIPLE_VERSION =$(shell echo $(notdir $(SDKROOT)) | sed -e 's/.*\([0-9]\.[0-9]\).*/\1/')
-          endif
-          ARCH_CFLAGS :=-mios-version-min=$(TRIPLE_VERSION) -isysroot "$(SDKROOT)"
-        else
-          ifeq "$(TRIPLE_ENV)" "macabi"
-            SDKROOT = $(shell xcrun --sdk macosx --show-sdk-path)
-          else
-            SDKROOT = $(shell xcrun --sdk iphonesimulator --show-sdk-path)
-          endif
-          ifeq "$(TRIPLE_VERSION)" ""
-            TRIPLE_VERSION =$(shell echo $(notdir $(SDKROOT)) | sed -e 's/.*\([0-9]\.[0-9]\).*/\1/')
-          endif
-          ifeq "$(TRIPLE_ENV)" "macabi"
-            ARCH_CFLAGS :=-mios-version-min=$(TRIPLE_VERSION) -isysroot "$(SDKROOT)"
-          else
-            ARCH_CFLAGS :=-mios-simulator-version-min=$(TRIPLE_VERSION) -isysroot "$(SDKROOT)"
-          endif
-        endif
+      ifeq "$(TRIPLE_ENV)" "simulator"
+        SDK_NAME := iphonesimulator
+        SDK_NAME := macosx
+        SDK_NAME := iphoneos
+    endif
+    ifeq "$(TRIPLE_OS)" "tvos"
+      ifeq "$(TRIPLE_ENV)" "simulator"
+        SDK_NAME := appletvsimulator
+        SDK_NAME := appletvos
+    ifeq "$(TRIPLE_OS)" "watchos"
+      ifeq "$(TRIPLE_ENV)" "simulator"
+        SDK_NAME := watchsimulator
+      else
+        SDK_NAME := watchos
       endif
     endif
-    ifeq "$(TRIPLE_OS)" "watchos"
+    ifneq "$(TRIPLE_OS)" "macosx"
+      ifeq "$(TRIPLE_ENV)" ""
         CODESIGN := codesign
-      ifeq "$(SDKROOT)" ""
-        # Set SDKROOT if it wasn't set
-        ifneq (,$(findstring arm,$(ARCH)))
-          SDKROOT = $(shell xcrun --sdk watchos --show-sdk-path)
-          ifeq "$(TRIPLE_VERSION)" ""
-            TRIPLE_VERSION =$(shell echo $(notdir $(SDKROOT)) | sed -e 's/.*\([0-9]\.[0-9]\).*/\1/')
-          endif
-          ARCH_CFLAGS :=-mwatchos-version-min=$(TRIPLE_VERSION) -isysroot "$(SDKROOT)"
-        else
-          SDKROOT = $(shell xcrun --sdk watchsimulator --show-sdk-path)
-          ifeq "$(TRIPLE_VERSION)" ""
-            TRIPLE_VERSION =$(shell echo $(notdir $(SDKROOT)) | sed -e 's/.*\([0-9]\.[0-9]\).*/\1/')
-          endif
-          ARCH_CFLAGS :=-mwatchos-simulator-version-min=$(TRIPLE_VERSION) -isysroot "$(SDKROOT)"
-        endif
-      endif
+      endif
+    endif
+
+      SDKROOT := $(shell xcrun --sdk $(SDK_NAME) --show-sdk-path)
+      TRIPLE_VERSION := $(shell echo $(notdir $(SDKROOT)) | grep -E -o -e '[0-9]+\.[0-9]')
+    ifeq "$(TRIPLE_ENV)" "simulator"
+      ARCH_CFLAGS := -m$(TRIPLE_OS)-simulator-version-min=$(TRIPLE_VERSION)
+    else
+    ifneq "$(TRIPLE_OS)" "macosx"
+      ARCH_CFLAGS := -m$(TRIPLE_OS)-version-min=$(TRIPLE_VERSION)
     endif
   endif
+  ARCH_CFLAGS += -target $(TRIPLE)
 endif
 ifeq "$(OS)" "Android"
   include $(THIS_FILE_DIR)/Android.rules
 endif
 
 #----------------------------------------------------------------------
 # If ARCH is not defined, default to x86_64.
 #----------------------------------------------------------------------

lldb/source/Plugins/Platform/MacOSX/PlatformAppleSimulator.h

 class PlatformAppleSimulator : public PlatformDarwin {
 public:
   // Class Functions
   static void Initialize();
 
   static void Terminate();
 
   // Class Methods
-  PlatformAppleSimulator();
+  PlatformAppleSimulator(
+      CoreSimulatorSupport::DeviceType::ProductFamilyID kind);
 
   virtual ~PlatformAppleSimulator();
 
   lldb_private::Status
   LaunchProcess(lldb_private::ProcessLaunchInfo &launch_info) override;
 
   void GetStatus(lldb_private::Stream &strm) override;
 
   lldb_private::Status ConnectRemote(lldb_private::Args &args) override;
 
   lldb_private::Status DisconnectRemote() override;
 
   lldb::ProcessSP DebugProcess(lldb_private::ProcessLaunchInfo &launch_info,
                                lldb_private::Debugger &debugger,
                                lldb_private::Target *target,
                                lldb_private::Status &error) override;
 
 protected:
   std::mutex m_core_sim_path_mutex;
   llvm::Optional<lldb_private::FileSpec> m_core_simulator_framework_path;
   llvm::Optional<CoreSimulatorSupport::Device> m_device;
+  CoreSimulatorSupport::DeviceType::ProductFamilyID m_kind;
 
   lldb_private::FileSpec GetCoreSimulatorPath();
 
   void LoadCoreSimulator();
 
 #if defined(__APPLE__)
   CoreSimulatorSupport::Device GetSimulatorDevice();
 #endif
 
 private:
   PlatformAppleSimulator(const PlatformAppleSimulator &) = delete;
   const PlatformAppleSimulator &
   operator=(const PlatformAppleSimulator &) = delete;
 };
 
 #endif // LLDB_SOURCE_PLUGINS_PLATFORM_MACOSX_PLATFORMAPPLESIMULATOR_H

lldb/source/Plugins/Platform/MacOSX/PlatformAppleSimulator.cpp

 #endif
 
 // Static Functions
 void PlatformAppleSimulator::Initialize() { PlatformDarwin::Initialize(); }
 
 void PlatformAppleSimulator::Terminate() { PlatformDarwin::Terminate(); }
 
 /// Default Constructor
-PlatformAppleSimulator::PlatformAppleSimulator()
-    : PlatformDarwin(true), m_core_sim_path_mutex(),
-      m_core_simulator_framework_path(), m_device() {}
+PlatformAppleSimulator::PlatformAppleSimulator(
+    CoreSimulatorSupport::DeviceType::ProductFamilyID kind)
+    : PlatformDarwin(true), m_kind(kind) {}
 
 /// Destructor.
 ///
 /// The destructor is virtual since this class is designed to be
 /// inherited from by the plug-in instance.
 PlatformAppleSimulator::~PlatformAppleSimulator() {}
 
 lldb_private::Status PlatformAppleSimulator::LaunchProcess(
#else
   return ProcessSP();
 #endif
 }
 
 FileSpec PlatformAppleSimulator::GetCoreSimulatorPath() {
 #if defined(__APPLE__)
   std::lock_guard<std::mutex> guard(m_core_sim_path_mutex);
   if (!m_core_simulator_framework_path.hasValue()) {
-    if (FileSpec fspec = HostInfo::GetXcodeDeveloperDirectory()) {
-      std::string developer_dir = fspec.GetPath();
-      StreamString cs_path;
-      cs_path.Printf(
-          "%s/Library/PrivateFrameworks/CoreSimulator.framework/CoreSimulator",
-          developer_dir.c_str());
-      m_core_simulator_framework_path = FileSpec(cs_path.GetData());
-      FileSystem::Instance().Resolve(*m_core_simulator_framework_path);
-    } else
-      m_core_simulator_framework_path = FileSpec();
+    m_core_simulator_framework_path =
+        FileSpec("/Library/Developer/PrivateFrameworks/CoreSimulator.framework/"
+                 "CoreSimulator");
   }
-
   return m_core_simulator_framework_path.getValue();
 #else
   return FileSpec();
 #endif
 }
 
 void PlatformAppleSimulator::LoadCoreSimulator() {
 #if defined(__APPLE__)
   static llvm::once_flag g_load_core_sim_flag;
   llvm::call_once(g_load_core_sim_flag, [this] {
     const std::string core_sim_path(GetCoreSimulatorPath().GetPath());
     if (core_sim_path.size())
       dlopen(core_sim_path.c_str(), RTLD_LAZY);
   });
 #endif
 }
 
 #if defined(__APPLE__)
 CoreSimulatorSupport::Device PlatformAppleSimulator::GetSimulatorDevice() {
   if (!m_device.hasValue()) {
-    const CoreSimulatorSupport::DeviceType::ProductFamilyID dev_id =
-        CoreSimulatorSupport::DeviceType::ProductFamilyID::iPhone;
+    const CoreSimulatorSupport::DeviceType::ProductFamilyID dev_id = m_kind;
     std::string developer_dir = HostInfo::GetXcodeDeveloperDirectory().GetPath();
     m_device = CoreSimulatorSupport::DeviceSet::GetAvailableDevices(
                    developer_dir.c_str())
                    .GetFanciest(dev_id);
   }
 
   if (m_device.hasValue())
     return m_device.getValue();
   else
     return CoreSimulatorSupport::Device();
 }
 #endif

lldb/source/Plugins/Platform/MacOSX/PlatformAppleTVSimulator.h

 //===-- PlatformAppleTVSimulator.h ------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLDB_SOURCE_PLUGINS_PLATFORM_MACOSX_PLATFORMAPPLETVSIMULATOR_H
 #define LLDB_SOURCE_PLUGINS_PLATFORM_MACOSX_PLATFORMAPPLETVSIMULATOR_H
 
-#include "PlatformDarwin.h"
+#include "PlatformAppleSimulator.h"
 
-class PlatformAppleTVSimulator : public PlatformDarwin {
+class PlatformAppleTVSimulator : public PlatformAppleSimulator {
 public:
   // Class Functions
   static lldb::PlatformSP CreateInstance(bool force,
                                          const lldb_private::ArchSpec *arch);
 
   static void Initialize();
 
   static void Terminate();
return PlatformDarwin::AddClangModuleCompilationOptionsForSDKType(
         target, options, lldb_private::XcodeSDK::Type::iPhoneSimulator);
   }
 
 protected:
   std::mutex m_sdk_dir_mutex;
   std::string m_sdk_directory;
   std::string m_build_update;
 
-  const char *GetSDKDirectoryAsCString();
+  llvm::StringRef GetSDKDirectoryAsCString();
 
 private:
   PlatformAppleTVSimulator(const PlatformAppleTVSimulator &) = delete;
   const PlatformAppleTVSimulator &
   operator=(const PlatformAppleTVSimulator &) = delete;
 };
 
 #endif // LLDB_SOURCE_PLUGINS_PLATFORM_MACOSX_PLATFORMAPPLETVSIMULATOR_H

lldb/source/Plugins/Platform/MacOSX/PlatformAppleTVSimulator.cpp

 }
 
 const char *PlatformAppleTVSimulator::GetDescriptionStatic() {
   return "Apple TV simulator platform plug-in.";
 }
 
 /// Default Constructor
 PlatformAppleTVSimulator::PlatformAppleTVSimulator()
-    : PlatformDarwin(true), m_sdk_dir_mutex(), m_sdk_directory() {}
+    : PlatformAppleSimulator(
+          CoreSimulatorSupport::DeviceType::ProductFamilyID::appleTV) {}
 
 /// Destructor.
 ///
 /// The destructor is virtual since this class is designed to be
 /// inherited from by the plug-in instance.
 PlatformAppleTVSimulator::~PlatformAppleTVSimulator() {}
 
 void PlatformAppleTVSimulator::GetStatus(Stream &strm) {
   Platform::GetStatus(strm);
-  const char *sdk_directory = GetSDKDirectoryAsCString();
-  if (sdk_directory)
-    strm.Printf("  SDK Path: \"%s\"\n", sdk_directory);
+  llvm::StringRef sdk_directory = GetSDKDirectoryAsCString();
+  if (!sdk_directory.empty())
+    strm.Printf("  SDK Path: \"%s\"\n", sdk_directory.str().c_str());
   else
     strm.PutCString("  SDK Path: error: unable to locate SDK\n");
 }
 
 Status PlatformAppleTVSimulator::ResolveExecutable(
     const ModuleSpec &module_spec, lldb::ModuleSP &exe_module_sp,
     const FileSpecList *module_search_paths_ptr) {
   Status error;
Status PlatformAppleTVSimulator::ResolveExecutable(
   } else {
     error.SetErrorStringWithFormat("'%s' does not exist",
                                    module_spec.GetFileSpec().GetPath().c_str());
   }
 
   return error;
 }
 
-static FileSystem::EnumerateDirectoryResult
-EnumerateDirectoryCallback(void *baton, llvm::sys::fs::file_type ft,
-                           llvm::StringRef path) {
-  if (ft == llvm::sys::fs::file_type::directory_file) {
-    FileSpec file_spec(path);
-    const char *filename = file_spec.GetFilename().GetCString();
-    if (filename &&
-        strncmp(filename, "AppleTVSimulator", strlen("AppleTVSimulator")) ==
-            0) {
-      ::snprintf((char *)baton, PATH_MAX, "%s", filename);
-      return FileSystem::eEnumerateDirectoryResultQuit;
-    }
-  }
-  return FileSystem::eEnumerateDirectoryResultNext;
-}
-
-const char *PlatformAppleTVSimulator::GetSDKDirectoryAsCString() {
-  std::lock_guard<std::mutex> guard(m_sdk_dir_mutex);
-  if (m_sdk_directory.empty()) {
-    if (FileSpec fspec = HostInfo::GetXcodeDeveloperDirectory()) {
-      std::string developer_dir = fspec.GetPath();
-      char sdks_directory[PATH_MAX];
-      char sdk_dirname[PATH_MAX];
-      sdk_dirname[0] = '\0';
-      snprintf(sdks_directory, sizeof(sdks_directory),
-               "%s/Platforms/AppleTVSimulator.platform/Developer/SDKs",
-               developer_dir.c_str());
-      FileSpec simulator_sdk_spec;
-      bool find_directories = true;
-      bool find_files = false;
-      bool find_other = false;
-      FileSystem::Instance().EnumerateDirectory(
-          sdks_directory, find_directories, find_files, find_other,
-          EnumerateDirectoryCallback, sdk_dirname);
-
-      if (sdk_dirname[0]) {
-        m_sdk_directory = sdks_directory;
-        m_sdk_directory.append(1, '/');
-        m_sdk_directory.append(sdk_dirname);
-        return m_sdk_directory.c_str();
-      }
-    }
-    // Assign a single NULL character so we know we tried to find the device
-    // support directory and we don't keep trying to find it over and over.
-    m_sdk_directory.assign(1, '\0');
-  }
-
-  // We should have put a single NULL character into m_sdk_directory or it
-  // should have a valid path if the code gets here
-  assert(m_sdk_directory.empty() == false);
-  if (m_sdk_directory[0])
-    return m_sdk_directory.c_str();
-  return NULL;
+llvm::StringRef PlatformAppleTVSimulator::GetSDKDirectoryAsCString() {
+  llvm::StringRef sdk;
+  sdk = HostInfo::GetXcodeSDKPath(XcodeSDK("AppleTVSimulator.Internal.sdk"));
+  if (sdk.empty())
+    sdk = HostInfo::GetXcodeSDKPath(XcodeSDK("AppleTVSimulator.sdk"));
+  return sdk;
 }
 
 Status PlatformAppleTVSimulator::GetSymbolFile(const FileSpec &platform_file,
                                                const UUID *uuid_ptr,
                                                FileSpec &local_file) {
   Status error;
   char platform_file_path[PATH_MAX];
   if (platform_file.GetPath(platform_file_path, sizeof(platform_file_path))) {
     char resolved_path[PATH_MAX];
 
-    const char *sdk_dir = GetSDKDirectoryAsCString();
-    if (sdk_dir) {
-      ::snprintf(resolved_path, sizeof(resolved_path), "%s/%s", sdk_dir,
-                 platform_file_path);
+    llvm::StringRef sdk_dir = GetSDKDirectoryAsCString();
+    if (!sdk_dir.empty()) {
+      ::snprintf(resolved_path, sizeof(resolved_path), "%s/%s",
+                 sdk_dir.str().c_str(), platform_file_path);
 
       // First try in the SDK and see if the file is in there
       local_file.SetFile(resolved_path, FileSpec::Style::native);
       FileSystem::Instance().Resolve(local_file);
       if (FileSystem::Instance().Exists(local_file))
         return error;
 
       // Else fall back to the actual path itself
bool PlatformAppleTVSimulator::GetSupportedArchitectureAtIndex(uint32_t idx,
                                                                ArchSpec &arch) {
   static const ArchSpec platform_arch(
       HostInfo::GetArchitecture(HostInfo::eArchKind64));
 
   if (idx == 0) {
     arch = platform_arch;
     if (arch.IsValid()) {
       arch.GetTriple().setOS(llvm::Triple::TvOS);
+      arch.GetTriple().setEnvironment(llvm::Triple::Simulator);
       return true;
     }
   }
   return false;
 }

lldb/source/Plugins/Platform/MacOSX/PlatformAppleWatchSimulator.h

 //===-- PlatformAppleWatchSimulator.h ---------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLDB_SOURCE_PLUGINS_PLATFORM_MACOSX_PLATFORMAPPLEWATCHSIMULATOR_H
 #define LLDB_SOURCE_PLUGINS_PLATFORM_MACOSX_PLATFORMAPPLEWATCHSIMULATOR_H
 
-#include "PlatformDarwin.h"
+#include "PlatformAppleSimulator.h"
 
-class PlatformAppleWatchSimulator : public PlatformDarwin {
+class PlatformAppleWatchSimulator : public PlatformAppleSimulator {
 public:
   // Class Functions
   static lldb::PlatformSP CreateInstance(bool force,
                                          const lldb_private::ArchSpec *arch);
 
   static void Initialize();
 
   static void Terminate();
return PlatformDarwin::AddClangModuleCompilationOptionsForSDKType(
         target, options, lldb_private::XcodeSDK::Type::iPhoneSimulator);
   }
 
 protected:
   std::mutex m_sdk_dir_mutex;
   std::string m_sdk_directory;
   std::string m_build_update;
 
-  const char *GetSDKDirectoryAsCString();
+  llvm::StringRef GetSDKDirectoryAsCString();
 
 private:
   PlatformAppleWatchSimulator(const PlatformAppleWatchSimulator &) = delete;
   const PlatformAppleWatchSimulator &
   operator=(const PlatformAppleWatchSimulator &) = delete;
 };
 
 #endif // LLDB_SOURCE_PLUGINS_PLATFORM_MACOSX_PLATFORMAPPLEWATCHSIMULATOR_H

lldb/source/Plugins/Platform/MacOSX/PlatformAppleWatchSimulator.cpp

if (log) {
 
     LLDB_LOGF(log, "PlatformAppleWatchSimulator::%s(force=%s, arch={%s,%s})",
               __FUNCTION__, force ? "true" : "false", arch_name, triple_cstr);
   }
 
   bool create = force;
   if (!create && arch && arch->IsValid()) {
     switch (arch->GetMachine()) {
-    case llvm::Triple::x86_64: {
+    case llvm::Triple::x86_64:
+    case llvm::Triple::x86: {
       const llvm::Triple &triple = arch->GetTriple();
       switch (triple.getVendor()) {
       case llvm::Triple::Apple:
         create = true;
         break;
 
 #if defined(__APPLE__)
       // Only accept "unknown" for the vendor if the host is Apple and it

 }
 
 const char *PlatformAppleWatchSimulator::GetDescriptionStatic() {
   return "Apple Watch simulator platform plug-in.";
 }
 
 /// Default Constructor
 PlatformAppleWatchSimulator::PlatformAppleWatchSimulator()
-    : PlatformDarwin(true), m_sdk_directory() {}
+    : PlatformAppleSimulator(
+          CoreSimulatorSupport::DeviceType::ProductFamilyID::appleWatch) {}
 
 /// Destructor.
 ///
 /// The destructor is virtual since this class is designed to be
 /// inherited from by the plug-in instance.
 PlatformAppleWatchSimulator::~PlatformAppleWatchSimulator() {}
 
 void PlatformAppleWatchSimulator::GetStatus(Stream &strm) {
   Platform::GetStatus(strm);
-  const char *sdk_directory = GetSDKDirectoryAsCString();
-  if (sdk_directory)
-    strm.Printf("  SDK Path: \"%s\"\n", sdk_directory);
+  llvm::StringRef sdk_directory = GetSDKDirectoryAsCString();
+  if (!sdk_directory.empty())
+    strm.Printf("  SDK Path: \"%s\"\n", sdk_directory.str().c_str());
   else
     strm.PutCString("  SDK Path: error: unable to locate SDK\n");
 }
 
 Status PlatformAppleWatchSimulator::ResolveExecutable(
     const ModuleSpec &module_spec, lldb::ModuleSP &exe_module_sp,
     const FileSpecList *module_search_paths_ptr) {
   Status error;
Status PlatformAppleWatchSimulator::ResolveExecutable(
   } else {
     error.SetErrorStringWithFormat("'%s' does not exist",
                                    module_spec.GetFileSpec().GetPath().c_str());
   }
 
   return error;
 }
 
-static FileSystem::EnumerateDirectoryResult
-EnumerateDirectoryCallback(void *baton, llvm::sys::fs::file_type ft,
-                           llvm::StringRef path) {
-  if (ft == llvm::sys::fs::file_type::directory_file) {
-    FileSpec file_spec(path);
-    const char *filename = file_spec.GetFilename().GetCString();
-    if (filename &&
-        strncmp(filename, "AppleWatchSimulator",
-                strlen("AppleWatchSimulator")) == 0) {
-      ::snprintf((char *)baton, PATH_MAX, "%s", filename);
-      return FileSystem::eEnumerateDirectoryResultQuit;
-    }
-  }
-  return FileSystem::eEnumerateDirectoryResultNext;
-}
-
-const char *PlatformAppleWatchSimulator::GetSDKDirectoryAsCString() {
-  std::lock_guard<std::mutex> guard(m_sdk_dir_mutex);
-  if (m_sdk_directory.empty()) {
-    if (FileSpec fspec = HostInfo::GetXcodeDeveloperDirectory()) {
-      std::string developer_dir = fspec.GetPath();
-      char sdks_directory[PATH_MAX];
-      char sdk_dirname[PATH_MAX];
-      sdk_dirname[0] = '\0';
-      snprintf(sdks_directory, sizeof(sdks_directory),
-               "%s/Platforms/AppleWatchSimulator.platform/Developer/SDKs",
-               developer_dir.c_str());
-      FileSpec simulator_sdk_spec;
-      bool find_directories = true;
-      bool find_files = false;
-      bool find_other = false;
-      FileSystem::Instance().EnumerateDirectory(
-          sdks_directory, find_directories, find_files, find_other,
-          EnumerateDirectoryCallback, sdk_dirname);
-
-      if (sdk_dirname[0]) {
-        m_sdk_directory = sdks_directory;
-        m_sdk_directory.append(1, '/');
-        m_sdk_directory.append(sdk_dirname);
-        return m_sdk_directory.c_str();
-      }
-    }
-    // Assign a single NULL character so we know we tried to find the device
-    // support directory and we don't keep trying to find it over and over.
-    m_sdk_directory.assign(1, '\0');
-  }
-
-  // We should have put a single NULL character into m_sdk_directory or it
-  // should have a valid path if the code gets here
-  assert(m_sdk_directory.empty() == false);
-  if (m_sdk_directory[0])
-    return m_sdk_directory.c_str();
-  return NULL;
+llvm::StringRef PlatformAppleWatchSimulator::GetSDKDirectoryAsCString() {
+  llvm::StringRef sdk;
+  sdk = HostInfo::GetXcodeSDKPath(XcodeSDK("WatchSimulator.Internal.sdk"));
+  if (sdk.empty())
+    sdk = HostInfo::GetXcodeSDKPath(XcodeSDK("WatchSimulator.sdk"));
+  return sdk;
 }
 
 Status PlatformAppleWatchSimulator::GetSymbolFile(const FileSpec &platform_file,
                                                   const UUID *uuid_ptr,
                                                   FileSpec &local_file) {
   Status error;
   char platform_file_path[PATH_MAX];
   if (platform_file.GetPath(platform_file_path, sizeof(platform_file_path))) {
     char resolved_path[PATH_MAX];
 
-    const char *sdk_dir = GetSDKDirectoryAsCString();
-    if (sdk_dir) {
-      ::snprintf(resolved_path, sizeof(resolved_path), "%s/%s", sdk_dir,
-                 platform_file_path);
+    llvm::StringRef sdk_dir = GetSDKDirectoryAsCString();
+    if (!sdk_dir.empty()) {
+      ::snprintf(resolved_path, sizeof(resolved_path), "%s/%s",
+                 sdk_dir.str().c_str(), platform_file_path);
 
       // First try in the SDK and see if the file is in there
       local_file.SetFile(resolved_path, FileSpec::Style::native);
       FileSystem::Instance().Resolve(local_file);
       if (FileSystem::Instance().Exists(local_file))
         return error;
 
       // Else fall back to the actual path itself
if (proc_info.GetArchitecture().GetTriple().getOS() ==
       process_infos.push_back(proc_info);
     }
   }
   return process_infos.size();
 }
 
 bool PlatformAppleWatchSimulator::GetSupportedArchitectureAtIndex(
     uint32_t idx, ArchSpec &arch) {
-  static const ArchSpec platform_arch(
-      HostInfo::GetArchitecture(HostInfo::eArchKind64));
-
   if (idx == 0) {
-    arch = platform_arch;
+    arch = HostInfo::GetArchitecture(HostInfo::eArchKind32);
+    if (arch.IsValid()) {
+      arch.GetTriple().setOS(llvm::Triple::WatchOS);
+      arch.GetTriple().setEnvironment(llvm::Triple::Simulator);
+      return true;
+    }
+  }
+
+  if (idx == 1) {
+    arch = HostInfo::GetArchitecture(HostInfo::eArchKind64);
     if (arch.IsValid()) {
       arch.GetTriple().setOS(llvm::Triple::WatchOS);
+      arch.GetTriple().setEnvironment(llvm::Triple::Simulator);
       return true;
     }
   }
   return false;
 }

lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.h

return PlatformDarwin::AddClangModuleCompilationOptionsForSDKType(
         target, options, lldb_private::XcodeSDK::Type::iPhoneSimulator);
   }
 
 protected:
   std::mutex m_sdk_dir_mutex;
   std::string m_sdk_directory;
   std::string m_build_update;
 
-  const char *GetSDKDirectoryAsCString();
+  llvm::StringRef GetSDKDirectoryAsCString();
 
 private:
   PlatformiOSSimulator(const PlatformiOSSimulator &) = delete;
   const PlatformiOSSimulator &operator=(const PlatformiOSSimulator &) = delete;
 };
 
 #endif // LLDB_SOURCE_PLUGINS_PLATFORM_MACOSX_PLATFORMIOSSIMULATOR_H

lldb/source/Plugins/Platform/MacOSX/PlatformiOSSimulator.cpp

 }
 
 const char *PlatformiOSSimulator::GetDescriptionStatic() {
   return "iOS simulator platform plug-in.";
 }
 
 /// Default Constructor
 PlatformiOSSimulator::PlatformiOSSimulator()
-    : PlatformAppleSimulator(), m_sdk_dir_mutex(), m_sdk_directory(),
-      m_build_update() {}
+    : PlatformAppleSimulator(
+          CoreSimulatorSupport::DeviceType::ProductFamilyID::iPhone) {}
 
 /// Destructor.
 ///
 /// The destructor is virtual since this class is designed to be
 /// inherited from by the plug-in instance.
 PlatformiOSSimulator::~PlatformiOSSimulator() {}
 
 void PlatformiOSSimulator::GetStatus(Stream &strm) {
   Platform::GetStatus(strm);
-  const char *sdk_directory = GetSDKDirectoryAsCString();
-  if (sdk_directory)
-    strm.Printf("  SDK Path: \"%s\"\n", sdk_directory);
+  llvm::StringRef sdk_directory = GetSDKDirectoryAsCString();
+  if (!sdk_directory.empty())
+    strm.Printf("  SDK Path: \"%s\"\n", sdk_directory.str().c_str());
   else
     strm.PutCString("  SDK Path: error: unable to locate SDK\n");
   PlatformAppleSimulator::GetStatus(strm);
 }
 
 Status PlatformiOSSimulator::ResolveExecutable(
     const ModuleSpec &module_spec, lldb::ModuleSP &exe_module_sp,
     const FileSpecList *module_search_paths_ptr) {
Status PlatformiOSSimulator::ResolveExecutable(
   } else {
     error.SetErrorStringWithFormat("'%s' does not exist",
                                    module_spec.GetFileSpec().GetPath().c_str());
   }
 
   return error;
 }
 
-static FileSystem::EnumerateDirectoryResult
-EnumerateDirectoryCallback(void *baton, llvm::sys::fs::file_type ft,
-                           llvm::StringRef path) {
-  if (ft == llvm::sys::fs::file_type::directory_file) {
-    FileSpec file_spec(path);
-    const char *filename = file_spec.GetFilename().GetCString();
-    if (filename &&
-        strncmp(filename, "iPhoneSimulator", strlen("iPhoneSimulator")) == 0) {
-      ::snprintf((char *)baton, PATH_MAX, "%s", filename);
-      return FileSystem::eEnumerateDirectoryResultQuit;
-    }
-  }
-  return FileSystem::eEnumerateDirectoryResultNext;
-}
-
-const char *PlatformiOSSimulator::GetSDKDirectoryAsCString() {
-  std::lock_guard<std::mutex> guard(m_sdk_dir_mutex);
-  if (m_sdk_directory.empty()) {
-    if (FileSpec fspec = HostInfo::GetXcodeDeveloperDirectory()) {
-      std::string developer_dir = fspec.GetPath();
-      char sdks_directory[PATH_MAX];
-      char sdk_dirname[PATH_MAX];
-      sdk_dirname[0] = '\0';
-      snprintf(sdks_directory, sizeof(sdks_directory),
-               "%s/Platforms/iPhoneSimulator.platform/Developer/SDKs",
-               developer_dir.c_str());
-      FileSpec simulator_sdk_spec;
-      bool find_directories = true;
-      bool find_files = false;
-      bool find_other = false;
-      FileSystem::Instance().EnumerateDirectory(
-          sdks_directory, find_directories, find_files, find_other,
-          EnumerateDirectoryCallback, sdk_dirname);
-
-      if (sdk_dirname[0]) {
-        m_sdk_directory = sdks_directory;
-        m_sdk_directory.append(1, '/');
-        m_sdk_directory.append(sdk_dirname);
-        return m_sdk_directory.c_str();
-      }
-    }
-    // Assign a single NULL character so we know we tried to find the device
-    // support directory and we don't keep trying to find it over and over.
-    m_sdk_directory.assign(1, '\0');
-  }
-
-  // We should have put a single NULL character into m_sdk_directory or it
-  // should have a valid path if the code gets here
-  assert(m_sdk_directory.empty() == false);
-  if (m_sdk_directory[0])
-    return m_sdk_directory.c_str();
-  return NULL;
+llvm::StringRef PlatformiOSSimulator::GetSDKDirectoryAsCString() {
+  llvm::StringRef sdk;
+  sdk = HostInfo::GetXcodeSDKPath(XcodeSDK("iPhoneSimulator.Internal.sdk"));
+  if (sdk.empty())
+    sdk = HostInfo::GetXcodeSDKPath(XcodeSDK("iPhoneSimulator.sdk"));
+  return sdk;
 }
 
 Status PlatformiOSSimulator::GetSymbolFile(const FileSpec &platform_file,
                                            const UUID *uuid_ptr,
                                            FileSpec &local_file) {
   Status error;
   char platform_file_path[PATH_MAX];
   if (platform_file.GetPath(platform_file_path, sizeof(platform_file_path))) {
     char resolved_path[PATH_MAX];
 
-    const char *sdk_dir = GetSDKDirectoryAsCString();
-    if (sdk_dir) {
-      ::snprintf(resolved_path, sizeof(resolved_path), "%s/%s", sdk_dir,
-                 platform_file_path);
+    llvm::StringRef sdk_dir = GetSDKDirectoryAsCString();
+    if (!sdk_dir.empty()) {
+      ::snprintf(resolved_path, sizeof(resolved_path), "%s/%s",
+                 sdk_dir.str().c_str(), platform_file_path);
 
       // First try in the SDK and see if the file is in there
       local_file.SetFile(resolved_path, FileSpec::Style::native);
       FileSystem::Instance().Resolve(local_file);
       if (FileSystem::Instance().Exists(local_file))
         return error;
 
       // Else fall back to the actual path itself
static const ArchSpec platform_arch(
       HostInfo::GetArchitecture(HostInfo::eArchKindDefault));
   static const ArchSpec platform_arch64(
       HostInfo::GetArchitecture(HostInfo::eArchKind64));
 
   if (idx == 0) {
     arch = platform_arch;
     if (arch.IsValid()) {
       arch.GetTriple().setOS(llvm::Triple::IOS);
+      arch.GetTriple().setEnvironment(llvm::Triple::Simulator);
       return true;
     }
   } else {
     if (platform_arch.IsExactMatch(platform_arch64)) {
       // This macosx platform supports both 32 and 64 bit.
       if (idx == 1) {
         // 32/64: return "x86_64-apple-macosx" for architecture 1
         arch = platform_arch64;

lldb/source/Plugins/Platform/MacOSX/objcxx/PlatformiOSSimulatorCoreSimulatorSupport.mm

-//===-- PlatformiOSSimulatorCoreSimulatorSupport.cpp ---------------*- C++
-//-*-===//
+//===-- PlatformiOSSimulatorCoreSimulatorSupport.cpp ----------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #include "PlatformiOSSimulatorCoreSimulatorSupport.h"

 - (id)runtime;
 - (BOOL)available;
 - (NSString *)versionString;
 - (NSString *)buildVersionString;
 - (BOOL)bootWithOptions:(NSDictionary *)options error:(NSError **)error;
 - (NSUInteger)state;
 - (BOOL)shutdownWithError:(NSError **)error;
 - (NSUUID *)UDID;
-- (pid_t)spawnWithPath:(NSString *)path
-               options:(NSDictionary *)options
-    terminationHandler:(void (^)(int status))terminationHandler
-                 error:(NSError **)error;
+- (BOOL)spawnWithPath:(NSString *)path
+               options:(nullable NSDictionary<NSString *, id> *)options
+      terminationQueue:(nullable dispatch_queue_t)terminationQueue
+    terminationHandler:(nullable void (^)(int status))terminationHandler
+                   pid:(pid_t *_Nullable)pid
+                 error:(NSError *__autoreleasing _Nullable *_Nullable)error;
 @end
 
 CoreSimulatorSupport::Process::Process(lldb::pid_t p) : m_pid(p), m_error() {}
 
 CoreSimulatorSupport::Process::Process(Status error)
     : m_pid(LLDB_INVALID_PROCESS_ID), m_error(error) {}
 
 CoreSimulatorSupport::Process::Process(lldb::pid_t p, Status error)
#define kSimDeviceSpawnStdout @"stdout" /* An NSNumber corresponding to a fd   \
                                            */
 #define kSimDeviceSpawnStderr @"stderr" /* An NSNumber corresponding to a fd   \
                                            */
 #define kSimDeviceSpawnArguments                                               \
   @"arguments" /* An NSArray of strings to use as the argv array.  If not      \
                   provided, path will be argv[0] */
 #define kSimDeviceSpawnWaitForDebugger                                         \
   @"wait_for_debugger" /* An NSNumber (bool) */
+#define kSimDeviceSpawnStandalone @"standalone"
 
   NSMutableDictionary *options = [[NSMutableDictionary alloc] init];
 
+  options[kSimDeviceSpawnStandalone] = @(YES);
+
   if (launch_info.GetFlags().Test(lldb::eLaunchFlagDebug))
     [options setObject:@YES forKey:kSimDeviceSpawnWaitForDebugger];
 
   if (launch_info.GetArguments().GetArgumentCount()) {
     const Args &args(launch_info.GetArguments());
     NSMutableArray *args_array = [[NSMutableArray alloc] init];
     for (size_t idx = 0; idx < args.GetArgumentCount(); idx++)
       [args_array

 #undef kSimDeviceSpawnStdin
 #undef kSimDeviceSpawnStdout
 #undef kSimDeviceSpawnStderr
 #undef kSimDeviceSpawnWaitForDebugger
 #undef kSimDeviceSpawnArguments
 
   NSError *nserror;
 
-  pid_t pid = [m_dev
+  pid_t pid;
+  BOOL success = [m_dev
            spawnWithPath:[NSString stringWithUTF8String:launch_info
                                                             .GetExecutableFile()
                                                             .GetPath()
                                                             .c_str()]
                  options:options
+        terminationQueue:nil
       terminationHandler:nil
+                     pid:&pid
                    error:&nserror];
 
-  if (pid < 0) {
+  if (!success) {
     const char *nserror_string = [[nserror description] UTF8String];
     error.SetErrorString(nserror_string ? nserror_string : "unable to launch");
   }
 
   return CoreSimulatorSupport::Process(pid, error);
 }
 
 CoreSimulatorSupport::DeviceSet

lldb/test/API/macosx/simulator/Makefile

+C_SOURCES := hello.c
+
+include Makefile.rules

lldb/test/API/macosx/simulator/TestSimulatorPlatform.py

+import lldb
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test.decorators import *
+import lldbsuite.test.lldbutil as lldbutil
+import json
+import unittest2
+
+
+class TestSimulatorPlatformLaunching(TestBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+    NO_DEBUG_INFO_TESTCASE = True
+
+    def run_with(self, arch, platform, os, env):
+        self.build(dictionary={'TRIPLE': arch+'-apple-'+os+'-'+env, 'ARCH': arch})
+        lldbutil.run_to_source_breakpoint(self, "break here",
+                                          lldb.SBFileSpec("hello.c"))
+        self.expect('image list -b -t',
+                    patterns=['a\.out '+arch+'-apple-'+os+'.*-'+env])
+
+    @skipUnlessDarwin
+    @skipIfDarwinEmbedded
+    @apple_simulator_test('iphone')
+    def test_ios(self):
+        """Test running an iOS simulator binary"""
+        self.run_with(arch=self.getArchitecture(),
+                      os='ios', env='simulator',
+                      platform='iphonesimulator')
+
+    @skipUnlessDarwin
+    @skipIfDarwinEmbedded
+    @apple_simulator_test('appletv')
+    def test_tvos(self):
+        """Test running an tvOS simulator binary"""
+        self.run_with(arch=self.getArchitecture(),
+                      os='tvos', env='simulator',
+                      platform='appletvsimulator')
+
+    @skipUnlessDarwin
+    @skipIfDarwinEmbedded
+    @apple_simulator_test('watch')
+    def test_watchos(self):
+        """Test running a 32-bit watchOS simulator binary"""
+        self.run_with(arch='i386',
+                      os='watchos', env='simulator',
+                      platform='watchsimulator')

lldb/test/API/macosx/simulator/hello.c

+void puts(char *);
+int main(int argc, char **argv) {
+  puts("break here\n");
+  return 0;
+}