Merge pull request #83554 from compnerd/remote-mirror

Runtimes: add SwiftRemoteMirror to the new runtimes build

Author: compnerd

Runtimes/Core/CMakeLists.txt

@@ -119,6 +119,7 @@ defaulted_option(SwiftCore_ENABLE_COMPACT_ABSOLUTE_FUNCTION_POINTERS "Resolve ab
 defaulted_option(SwiftCore_ENABLE_BACKDEPLOYMENT_SUPPORT "Add symbols for runtime backdeployment")
 defaulted_option(SwiftCore_ENABLE_STDLIB_TRACING "Enable tracing in the runtime. Assumes the presence of os_log(3) and the os_signpost(3) API.")
 defaulted_option(SwiftCore_ENABLE_CONCURRENCY "Enable Concurrency runtime support")
+defaulted_option(SwiftCore_ENABLE_REMOTE_MIRROR "Enable RemoteMirror runtime support")
 defaulted_set(SwiftCore_CONCURRENCY_GLOBAL_EXECUTOR STRING "Default Concurrency global executor implementation")
 option(SwiftCore_ENABLE_COMMANDLINE_SUPPORT "Enable command line argument support" ON)
 option(SwiftCore_ENABLE_UNICODE_DATA "Include unicode data in Swift runtimes" ON)
@@ -225,6 +226,10 @@ endif()
 if(SwiftCore_ENABLE_CONCURRENCY)
   add_subdirectory(Concurrency)
 endif()
+if(SwiftCore_ENABLE_REMOTE_MIRROR)
+  add_subdirectory(RemoteInspection)
+  add_subdirectory(SwiftRemoteMirror)
+endif()
 
 # Inter-project install info
 export(EXPORT SwiftCoreTargets

Runtimes/Core/RemoteInspection/CMakeLists.txt

@@ -0,0 +1,24 @@
+
+add_library(swiftRemoteInspection OBJECT
+  MetadataSource.cpp
+  TypeLowering.cpp
+  TypeRef.cpp
+  TypeRefBuilder.cpp)
+target_compile_definitions(swiftRemoteInspection PRIVATE
+  $<$<BOOL:${SwiftCore_ENABLE_REFLECTION}>:SWIFT_ENABLE_REFLECTION>)
+target_include_directories(swiftRemoteInspection PRIVATE
+  "${PROJECT_BINARY_DIR}/include"
+  "${SwiftCore_SWIFTC_SOURCE_DIR}/include")
+target_include_directories(swiftRemoteInspection PUBLIC
+  "$<BUILD_INTERFACE:${SwiftCore_SWIFTC_SOURCE_DIR}/include/swift/RemoteInspection/RuntimeHeaders>")
+target_link_libraries(swiftRemoteInspection PRIVATE
+  swiftDemangling
+  $<$<BOOL:${SwiftCore_ENABLE_CRASH_REPORTER_CLIENT}>:swiftDemanglingCR>
+  swiftLLVMSupport
+  swiftShims)
+
+if(NOT BUILD_SHARED_LIBS)
+  install(TARGETS swiftRemoteInspection
+    EXPORT SwiftCoreTargets
+    COMPONENT SwiftCore_runtime)
+endif()

Runtimes/Core/SwiftRemoteMirror/CMakeLists.txt

@@ -0,0 +1,33 @@
+
+add_library(swiftRemoteMirror
+  SwiftRemoteMirror.cpp)
+target_link_libraries(swiftRemoteMirror PRIVATE
+  swiftRemoteInspection)
+target_include_directories(swiftRemoteMirror PRIVATE
+  "${PROJECT_BINARY_DIR}/include"
+  "${SwiftCore_SWIFTC_SOURCE_DIR}/include")
+target_link_libraries(swiftRemoteMirror PRIVATE
+  # FIXME(compnerd) why is this required? These should be transitively applied
+  # from `swiftRemoteInspection`
+  swiftDemangling
+  $<$<BOOL:${SwiftCore_ENABLE_CRASH_REPORTER_CLIENT}>:swiftDemanglingCR>
+  swiftLLVMSupport
+  swiftShims)
+
+install(TARGETS swiftRemoteMirror
+    EXPORT SwiftCoreTargets
+    COMPONENT SwiftCore_runtime
+    ARCHIVE DESTINATION "${SwiftCore_INSTALL_LIBDIR}"
+    LIBRARY DESTINATION "${SwiftCore_INSTALL_LIBDIR}"
+    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+install(FILES
+  ${SwiftCore_SWIFTC_SOURCE_DIR}/include/swift/SwiftRemoteMirror/MemoryReaderInterface.h
+  ${SwiftCore_SWIFTC_SOURCE_DIR}/include/swift/SwiftRemoteMirror/Platform.h
+  ${SwiftCore_SWIFTC_SOURCE_DIR}/include/swift/SwiftRemoteMirror/SwiftRemoteMirror.h
+  ${SwiftCore_SWIFTC_SOURCE_DIR}/include/swift/SwiftRemoteMirror/SwiftRemoteMirrorTypes.h
+  ${SwiftCore_SWIFTC_SOURCE_DIR}/include/swift/SwiftRemoteMirror/module.modulemap
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/swift/SwiftRemoteMirror")
+
+# Configure plist creation for Darwin platforms.
+generate_plist("${CMAKE_PROJECT_NAME}" "${CMAKE_PROJECT_VERSION}" swiftRemoteMirror)
+embed_manifest(swiftRemoteMirror)

Runtimes/Core/cmake/modules/DefaultSettings.cmake

@@ -42,13 +42,15 @@ if(APPLE)
   set(SwiftCore_ENABLE_RUNTIME_OS_VERSIONING_default ON)
   set(SwiftCore_ENABLE_OVERRIDABLE_RETAIN_RELEASE_default ON)
   set(SwiftCore_ENABLE_CONCURRENCY_default NO)
+  set(SwiftCore_ENABLE_REMOTE_MIRROR_default NO)
   set(SwiftCore_THREADING_PACKAGE_default "DARWIN")
   set(SwiftCore_ENABLE_PRESPECIALIZATION_default ON)
   set(SwiftCore_CONCURRENCY_GLOBAL_EXECUTOR_default "dispatch")
 elseif(CMAKE_SYSTEM_NAME STREQUAL "WASM")
   set(SwiftCore_OBJECT_FORMAT_default "elf")
   set(SwiftCore_THREADING_PACKAGE_default "NONE")
   set(SwiftCore_ENABLE_CONCURRENCY_default NO)
+  set(SwiftCore_ENABLE_REMOTE_MIRROR_default NO)
   set(SwiftCore_CONCURRENCY_GLOBAL_EXECUTOR_default "none")
 elseif(LINUX OR ANDROID OR BSD)
   set(SwiftCore_OBJECT_FORMAT_default "elf")
@@ -62,6 +64,7 @@ elseif(LINUX OR ANDROID OR BSD)
     set(SwiftCore_THREADING_PACKAGE_default "PTHREADS")
   endif()
   set(SwiftCore_ENABLE_CONCURRENCY_default NO)
+  set(SwiftCore_ENABLE_REMOTE_MIRROR_default NO)
   set(SwiftCore_CONCURRENCY_GLOBAL_EXECUTOR_default "dispatch")
 elseif(WIN32)
   set(SwiftCore_OBJECT_FORMAT_default "coff")
@@ -71,6 +74,7 @@ elseif(WIN32)
   set(SwiftCore_ENABLE_FATALERROR_BACKTRACE_default ON)
   set(SwiftCore_ENABLE_OVERRIDABLE_RETAIN_RELEASE_default ON)
   set(SwiftCore_ENABLE_CONCURRENCY_default NO)
+  set(SwiftCore_ENABLE_REMOTE_MIRROR_default NO)
   set(SwiftCore_THREADING_PACKAGE_default "WIN32")
   set(SwiftCore_ENABLE_PRESPECIALIZATION_default ON)
   set(SwiftCore_CONCURRENCY_GLOBAL_EXECUTOR_default "dispatch")

Runtimes/Resync.cmake

@@ -86,6 +86,8 @@ set(CoreLibs
   CommandLineSupport
   core
   SwiftOnoneSupport
+  RemoteInspection
+  SwiftRemoteMirror
   Concurrency
   Concurrency/InternalShims)
 

include/swift/RemoteInspection/RuntimeHeaders/llvm/Support/Error.h

@@ -15,7 +15,6 @@
 
 #include "llvm-c/Error.h"
 #include "llvm/ADT/Twine.h"
-#include "llvm/Config/abi-breaking.h"
 #include "llvm/Support/AlignOf.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/Debug.h"

utils/build.ps1

@@ -2577,6 +2577,8 @@ function Build-ExperimentalRuntime([Hashtable] $Platform, [switch] $Static = $fa
 
         # FIXME(compnerd) remove this once the default option is flipped to `ON`.
         SwiftCore_ENABLE_CONCURRENCY = "YES";
+        # FIXME(compnerd) remove this once the default option is flipped to `ON`.
+        SwiftCore_ENABLE_REMOTE_MIRROR = "YES";
       }
 
     Build-CMakeProject `