Merge pull request #78514 from al45tair/eng/PR-137201928

[Backtracing] Update module maps.

Author: al45tair

include/swift/Runtime/CrashInfo.h

@@ -24,7 +24,6 @@
 namespace swift {
 namespace runtime {
 namespace backtrace {
-extern "C" {
 #endif
 
 // Note: The "pointers" below are pointers in a different process's address
@@ -89,7 +88,6 @@ struct thread {
 #endif
 
 #ifdef __cplusplus
-} // extern "C"
 } // namespace backtrace
 } // namespace runtime
 } // namespace swift

stdlib/public/Backtracing/Backtrace.swift

@@ -16,14 +16,22 @@
 
 import Swift
 
-@_implementationOnly import OS.Libc
+#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+internal import Darwin
+#elseif os(Windows)
+internal import ucrt
+#elseif canImport(Glibc)
+internal import Glibc
+#elseif canImport(Musl)
+internal import Musl
+#endif
 
 #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
-@_implementationOnly import OS.Darwin
+internal import BacktracingImpl.OS.Darwin
 #endif
 
 #if os(Linux)
-@_implementationOnly import ImageFormats.Elf
+internal import BacktracingImpl.ImageFormats.Elf
 #endif
 
 /// Holds a backtrace.

stdlib/public/Backtracing/BacktraceFormatter.swift

@@ -17,7 +17,16 @@
 
 import Swift
 
-@_implementationOnly import OS.Libc
+#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+internal import Darwin
+internal import BacktracingImpl.OS.Darwin
+#elseif os(Windows)
+internal import ucrt
+#elseif canImport(Glibc)
+internal import Glibc
+#elseif canImport(Musl)
+internal import Musl
+#endif
 
 /// A backtrace formatting theme.
 @_spi(Formatting)

stdlib/public/Backtracing/CMakeLists.txt

@@ -36,9 +36,11 @@ set(BACKTRACING_SOURCES
   Image.swift
   ImageSource.swift
   MemoryImageSource.swift
+  Libc.swift
   MemoryReader.swift
   ProcMapsScanner.swift
   Registers.swift
+  Runtime.swift
   SymbolicatedBacktrace.swift
   Utils.swift
   Win32Extras.cpp
@@ -47,13 +49,12 @@ set(BACKTRACING_SOURCES
 )
 
 set(BACKTRACING_COMPILE_FLAGS
+  "-cxx-interoperability-mode=default"
   "-Xfrontend;-experimental-spi-only-imports"
   "-Xcc;-I${SWIFT_SOURCE_DIR}/include"
   "-Xcc;-I${CMAKE_BINARY_DIR}/include"
-  "-Xcc;-fno-implicit-module-maps"
-  "-Xcc;-fbuiltin-module-map"
-  "-Xcc;-fmodule-map-file=${SWIFT_STDLIB_SOURCE_DIR}/public/SwiftShims/swift/shims/module.modulemap"
-  "-Xcc;-fmodule-map-file=${SWIFT_STDLIB_SOURCE_DIR}/public/Backtracing/modules/module.modulemap")
+  "-Xcc;-I${SWIFT_STDLIB_SOURCE_DIR}/public/Backtracing/modules"
+  "-disable-upcoming-feature;MemberImportVisibility")
 
 ###TODO: Add these when we add static linking support
 #
@@ -79,6 +80,15 @@ add_swift_target_library(swift_Backtracing ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
 
   SWIFT_MODULE_DEPENDS ${concurrency}
 
+  SWIFT_MODULE_DEPENDS_ANDROID Android
+  SWIFT_MODULE_DEPENDS_LINUX Glibc
+  SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl
+  SWIFT_MODULE_DEPENDS_FREEBSD Glibc
+  SWIFT_MODULE_DEPENDS_OPENBSD Glibc
+  SWIFT_MODULE_DEPENDS_CYGWIN Glibc
+  SWIFT_MODULE_DEPENDS_HAIKU Glibc
+  SWIFT_MODULE_DEPENDS_WINDOWS CRT
+
   PRIVATE_LINK_LIBRARIES ${swift_backtracing_link_libraries}
 
   SWIFT_COMPILE_FLAGS

stdlib/public/Backtracing/Compression.swift

@@ -29,9 +29,17 @@
 
 import Swift
 
-@_implementationOnly import OS.Libc
-@_implementationOnly import CompressionLibs
-@_implementationOnly import ImageFormats.Elf
+#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+internal import Darwin
+#elseif os(Windows)
+internal import ucrt
+#elseif canImport(Glibc)
+internal import Glibc
+#elseif canImport(Musl)
+internal import Musl
+#endif
+internal import BacktracingImpl.CompressionLibs
+internal import BacktracingImpl.ImageFormats.Elf
 
 enum CompressedImageSourceError: Error {
   case unboundedImageSource
@@ -42,6 +50,9 @@ enum CompressedImageSourceError: Error {
   case outputOverrun
 }
 
+let zlib_stream_init = swift.runtime.zlib_stream_init
+let lzma_stream_init = swift.runtime.lzma_stream_init
+
 // .. CompressedStream .........................................................
 
 protocol CompressedStream {

stdlib/public/Backtracing/Context.swift

@@ -19,13 +19,26 @@
 
 import Swift
 
+#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
+internal import Darwin
+#elseif os(Windows)
+internal import ucrt
+#elseif canImport(Glibc)
+internal import Glibc
+#elseif canImport(Musl)
+internal import Musl
+#endif
+
 #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
-@_implementationOnly import OS.Darwin
-#elseif os(Linux)
-@_implementationOnly import OS.Linux
+internal import BacktracingImpl.OS.Darwin
 #endif
 
-@_implementationOnly import FixedLayout
+internal import BacktracingImpl.FixedLayout
+
+typealias x86_64_gprs = swift.runtime.backtrace.x86_64_gprs
+typealias i386_gprs = swift.runtime.backtrace.i386_gprs
+typealias arm64_gprs = swift.runtime.backtrace.arm64_gprs
+typealias arm_gprs = swift.runtime.backtrace.arm_gprs
 
 @_spi(Contexts) public enum ContextError: Error {
   case unableToFormTLSAddress

stdlib/public/Backtracing/CoreSymbolication.swift

@@ -19,8 +19,8 @@
 
 import Swift
 
-@_implementationOnly import OS.Libc
-@_implementationOnly import OS.Darwin
+internal import Darwin
+internal import BacktracingImpl.OS.Darwin
 
 // .. Dynamic binding ..........................................................