Merge pull request #29530 from swiftwasm/swiftwasm-ifdefs

[WebAssembly] Add ifdefs for the WASI target

Author: gribozavr

include/swift/Basic/Lazy.h

@@ -16,6 +16,8 @@
 #include <memory>
 #ifdef __APPLE__
 #include <dispatch/dispatch.h>
+#elif defined(__wasi__)
+// No pthread on wasi, see https://bugs.swift.org/browse/SR-12097 for more details.
 #else
 #include <mutex>
 #endif

include/swift/SwiftRemoteMirror/Platform.h

@@ -18,7 +18,7 @@ extern "C" {
 #endif
 
 #if defined(swiftRemoteMirror_EXPORTS)
-# if defined(__ELF__)
+# if defined(__ELF__) || defined(__WASM__)
 #   define SWIFT_REMOTE_MIRROR_LINKAGE __attribute__((__visibility__("protected")))
 # elif defined(__MACH__)
 #   define SWIFT_REMOTE_MIRROR_LINKAGE __attribute__((__visibility__("default")))
@@ -30,9 +30,7 @@ extern "C" {
 #   endif
 # endif
 #else
-# if defined(__ELF__)
-#   define SWIFT_REMOTE_MIRROR_LINKAGE __attribute__((__visibility__("default")))
-# elif defined(__MACH__)
+# if defined(__ELF__) || defined(__MACH__) || defined(__WASM__)
 #   define SWIFT_REMOTE_MIRROR_LINKAGE __attribute__((__visibility__("default")))
 # else
 #   if defined(_WINDLL)

lib/IRGen/IRGen.cpp

@@ -166,6 +166,12 @@ swift::getIRTargetOptions(const IRGenOptions &Opts, ASTContext &Ctx) {
   TargetOpts.FunctionSections = Opts.FunctionSections;
 
   auto *Clang = static_cast<ClangImporter *>(Ctx.getClangModuleLoader());
+
+  // WebAssembly doesn't support atomics yet, see https://bugs.swift.org/browse/SR-12097
+  // for more details.
+  if (Clang->getTargetInfo().getTriple().isOSBinFormatWasm())
+    TargetOpts.ThreadModel = llvm::ThreadModel::Single;
+
   clang::TargetOptions &ClangOpts = Clang->getTargetInfo().getTargetOpts();
   return std::make_tuple(TargetOpts, ClangOpts.CPU, ClangOpts.Features, ClangOpts.Triple);
 }

stdlib/private/StdlibUnittest/InterceptTraps.cpp

@@ -10,6 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+// No signals support on WASI yet, see https://github.com/WebAssembly/WASI/issues/166.
+#if !defined(__wasi__)
 #include <stdio.h>
 #include <signal.h>
 #include <string.h>
@@ -48,6 +50,8 @@ static void CrashCatcher(int Sig) {
   _exit(0);
 }
 
+#endif // __wasi__
+
 #if defined(_WIN32)
 static LONG WINAPI
 VectoredCrashHandler(PEXCEPTION_POINTERS ExceptionInfo) {
@@ -63,13 +67,16 @@ VectoredCrashHandler(PEXCEPTION_POINTERS ExceptionInfo) {
 
   return EXCEPTION_CONTINUE_SEARCH;
 }
-#endif
+#endif // _WIN32
 
 SWIFT_CC(swift) SWIFT_RUNTIME_LIBRARY_VISIBILITY extern "C"
 void installTrapInterceptor() {
   // Disable buffering on stdout so that everything is printed before crashing.
   setbuf(stdout, 0);
 
+// No signals support on WASI yet, see https://github.com/WebAssembly/WASI/issues/166.
+#if !defined(__wasi__)
+
 #if defined(_WIN32)
   _set_abort_behavior(0, _WRITE_ABORT_MSG);
 #endif
@@ -87,3 +94,4 @@ void installTrapInterceptor() {
 #endif
 }
 
+#endif // !defined(__wasi__)

stdlib/private/StdlibUnittest/RaceTest.swift

@@ -41,7 +41,7 @@ import SwiftPrivateLibcExtras
 import SwiftPrivateThreadExtras
 #if os(macOS) || os(iOS)
 import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
 import Glibc
 #elseif os(Windows)
 import MSVCRT
@@ -562,7 +562,9 @@ class _InterruptibleSleep {
       return
     }
 
-    var timeout = timeval(tv_sec: duration, tv_usec: 0)
+    // WebAssembly/WASI on wasm32 is the only 32-bit platform with Int64 time_t,
+    // needs an explicit conversion to `time_t` because of this.
+    var timeout = timeval(tv_sec: time_t(duration), tv_usec: 0)
 
     var readFDs = _stdlib_fd_set()
     var writeFDs = _stdlib_fd_set()

stdlib/private/StdlibUnittest/StdlibCoreExtras.swift

@@ -14,7 +14,7 @@ import SwiftPrivate
 import SwiftPrivateLibcExtras
 #if os(macOS) || os(iOS)
 import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
 import Glibc
 #elseif os(Windows)
 import MSVCRT

stdlib/private/StdlibUnittest/StdlibUnittest.swift

@@ -18,7 +18,7 @@ import SwiftPrivateLibcExtras
 #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
 import Foundation
 import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
 import Glibc
 #elseif os(Windows)
 import MSVCRT
@@ -748,6 +748,9 @@ extension ProcessTerminationStatus {
     case .signal(let signal):
 #if os(Windows)
       return CInt(signal) == SIGILL
+#elseif os(WASI)
+      // No signals support on WASI yet, see https://github.com/WebAssembly/WASI/issues/166.
+      return false
 #else
       return CInt(signal) == SIGILL || CInt(signal) == SIGTRAP
 #endif
@@ -1746,6 +1749,7 @@ public enum OSVersion : CustomStringConvertible {
   case windowsCygnus
   case windows
   case haiku
+  case wasi
 
   public var description: String {
     switch self {
@@ -1777,6 +1781,8 @@ public enum OSVersion : CustomStringConvertible {
       return "Windows"
     case .haiku:
       return "Haiku"
+    case .wasi:
+      return "WASI"
     }
   }
 }
@@ -1821,6 +1827,8 @@ func _getOSVersion() -> OSVersion {
   return .windows
 #elseif os(Haiku)
   return .haiku
+#elseif os(WASI)
+  return .wasi
 #else
   let productVersion = _getSystemVersionPlistProperty("ProductVersion")!
   let (major, minor, bugFix) = _parseDottedVersionTriple(productVersion)

stdlib/private/StdlibUnittest/SymbolLookup.swift

@@ -12,7 +12,7 @@
 
 #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
   import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
   import Glibc
 #elseif os(Windows)
   import MSVCRT
@@ -35,6 +35,8 @@
   #endif
 #elseif os(Windows)
   let hStdlibCore: HMODULE = GetModuleHandleA("swiftCore.dll")!
+#elseif os(WASI)
+// WASI doesn't support dynamic linking yet.
 #else
   #error("Unsupported platform")
 #endif
@@ -43,6 +45,8 @@ public func pointerToSwiftCoreSymbol(name: String) -> UnsafeMutableRawPointer? {
 #if os(Windows)
   return unsafeBitCast(GetProcAddress(hStdlibCore, name),
                        to: UnsafeMutableRawPointer?.self)
+#elseif os(WASI)
+  fatalError("\(#function) is not supported on WebAssembly/WASI")
 #else
   return dlsym(RTLD_DEFAULT, name)
 #endif

stdlib/private/SwiftPrivateLibcExtras/Subprocess.c

@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-// posix_spawn is not available on Android or Windows (MSVC).
-#if !defined(__ANDROID__) && !defined(__HAIKU__) && (!defined(_WIN32) || defined(__CYGWIN__))
+// posix_spawn is not available on Android, HAIKU, WASI or Windows (MSVC).
+#if !defined(__ANDROID__) && !defined(__HAIKU__) && (!defined(_WIN32) || defined(__CYGWIN__)) && !defined(__wasi__)
 
 #include "swift/Runtime/Config.h"
 
@@ -54,5 +54,5 @@ int _stdlib_posix_spawn(pid_t *__restrict pid, const char * __restrict path,
   return posix_spawn(pid, path, file_actions, attrp, argv, envp);
 }
 
-#endif // !defined(__ANDROID__) && !defined(__HAIKU__) && (!defined(_WIN32) || defined(__CGYWIN__))
+#endif // !defined(__ANDROID__) && !defined(__HAIKU__) && (!defined(_WIN32) || defined(__CGYWIN__)) && !defined(__wasi__)
 

stdlib/private/SwiftPrivateLibcExtras/Subprocess.swift

@@ -13,13 +13,15 @@
 import SwiftPrivate
 #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
 import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(WASI)
 import Glibc
 #elseif os(Windows)
 import MSVCRT
 import WinSDK
 #endif
 
+#if !os(WASI)
+// No signals support on WASI yet, see https://github.com/WebAssembly/WASI/issues/166.
 internal func _signalToString(_ signal: Int) -> String {
   switch CInt(signal) {
   case SIGILL:  return "SIGILL"
@@ -34,6 +36,7 @@ internal func _signalToString(_ signal: Int) -> String {
   default:      return "SIG???? (\(signal))"
   }
 }
+#endif
 
 public enum ProcessTerminationStatus : CustomStringConvertible {
   case exit(Int)
@@ -44,7 +47,12 @@ public enum ProcessTerminationStatus : CustomStringConvertible {
     case .exit(let status):
       return "Exit(\(status))"
     case .signal(let signal):
+#if os(WASI)
+      // No signals support on WASI yet, see https://github.com/WebAssembly/WASI/issues/166.
+      fatalError("Signals are not supported on WebAssembly/WASI")
+#else
       return "Signal(\(_signalToString(signal)))"
+#endif
     }
   }
 }
@@ -141,6 +149,15 @@ public func waitProcess(_ process: HANDLE) -> ProcessTerminationStatus {
   }
   return .exit(Int(status))
 }
+#elseif os(WASI)
+// WASI doesn't support child processes
+public func spawnChild(_ args: [String])
+  -> (pid: pid_t, stdinFD: CInt, stdoutFD: CInt, stderrFD: CInt) {
+  fatalError("\(#function) is not supported on WebAssembly/WASI")
+}
+public func posixWaitpid(_ pid: pid_t) -> ProcessTerminationStatus {
+  fatalError("\(#function) is not supported on WebAssembly/WASI")
+}
 #else
 // posix_spawn is not available on Android.
 // posix_spawn is not available on Haiku.