[pull] katei/swiftwasm from swiftwasm

.github/workflows/main.yml

@@ -0,0 +1,141 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - swiftwasm
+  pull_request:
+    branches:
+      - swiftwasm
+
+jobs:
+  linux_build:
+    timeout-minutes: 0
+    runs-on: ubuntu-18.04
+
+    steps:
+      - uses: actions/checkout@v1
+        with:
+          path: swift
+      - name: Build Linux installable archive
+        run: ./utils/webassembly/ci-linux.sh
+      - name: Upload Linux installable archive
+        uses: actions/upload-artifact@v1
+        with:
+          name: linux-installable
+          path: ../swiftwasm-linux.tar.gz
+      - name: Pack test results
+        run: tar cJf swift-test-results.tar.gz ../build/*/swift-linux-x86_64/swift-test-results
+      - name: Upload test results
+        uses: actions/upload-artifact@v1
+        with:
+          name: linux-test-results
+          path: ./swift-test-results.tar.gz
+
+  macos_build:
+    timeout-minutes: 0
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v1
+        with:
+          path: swift
+      - name: Build macOS installable archive
+        run: ./utils/webassembly/ci-mac.sh
+      - name: Upload macOS installable archive
+        uses: actions/upload-artifact@v1
+        with:
+          name: macos-installable
+          path: ../swiftwasm-macos.tar.gz
+      - name: Upload packaging scripts
+        uses: actions/upload-artifact@v1
+        with:
+          name: packaging-scripts
+          path: utils/webassembly
+      - name: Pack test results
+        run: tar cJf swift-test-results.tar.gz ../build/*/swift-macosx-x86_64/swift-test-results
+      - name: Upload test results
+        uses: actions/upload-artifact@v1
+        with:
+          name: macos-test-results
+          path: ./swift-test-results.tar.gz
+  package:
+    name: Build SwiftWasm packages
+    needs:
+      - linux_build
+      - macos_build
+    runs-on: ubuntu-18.04
+    steps:
+      - name: Download installable Linux archive
+        uses: actions/download-artifact@v1
+        with:
+          name: linux-installable
+      - name: Download installable macOS archive
+        uses: actions/download-artifact@v1
+        with:
+          name: macos-installable
+      - name: Download packaging scripts
+        uses: actions/download-artifact@v1
+        with:
+          name: packaging-scripts
+      - name: Build the packages
+        shell: bash
+        run: |
+          cd packaging-scripts
+          find . -name '*.sh' -exec chmod +x {} \;
+          chmod +x sdkroot/swiftwasm
+          ./download-prebuilts.sh
+
+          cp ../linux-installable/swiftwasm-linux.tar.gz \
+            ../macos-installable/swiftwasm-macos.tar.gz \
+            prebuilt
+          ./build-packages.sh
+
+          cd output
+          tar xf swiftwasm-sdk-linux.tar.xz && echo "Successfully unpacked Linux SDK"
+
+          cd swiftwasm-sdk
+          ./swiftwasm example/hello.swift hello.wasm && echo "Successfully linked hello.wasm"
+
+      - name: Upload macOS package
+        uses: actions/upload-artifact@v1
+        with:
+          name: macos-package
+          path: packaging-scripts/output/swiftwasm-sdk-macos.tar.xz
+
+      - name: Upload Linux package
+        uses: actions/upload-artifact@v1
+        with:
+          name: linux-package
+          path: packaging-scripts/output/swiftwasm-sdk-linux.tar.xz
+
+      - name: Upload hello.wasm compiled with Linux package
+        uses: actions/upload-artifact@v1
+        with:
+          name: linux-hello.wasm
+          path: packaging-scripts/output/swiftwasm-sdk/hello.wasm
+
+  macos_smoke_test:
+    name: Compile hello.swift on macOS
+    runs-on: macos-latest
+    needs: package
+    steps:
+      - name: Download SwiftWasm macOS package
+        uses: actions/download-artifact@v1
+        with:
+          name: macos-package
+
+      - name: Build hello.wasm
+        shell: bash
+        run: |
+          cd macos-package
+          tar xf swiftwasm-sdk-macos.tar.xz && echo "Successfully unpacked macOS SDK"
+
+          cd swiftwasm-sdk
+          ./swiftwasm example/hello.swift hello.wasm && echo "Successfully linked hello.wasm"
+
+      - name: Upload hello.wasm compiled with macOS package
+        uses: actions/upload-artifact@v1
+        with:
+          name: macos-hello.wasm
+          path: macos-package/swiftwasm-sdk/hello.wasm

CMakeLists.txt

@@ -260,11 +260,11 @@ set(SWIFT_ANDROID_DEPLOY_DEVICE_PATH "" CACHE STRING
   "Path on an Android device where build products will be pushed. These are used when running the test suite against the device")
 
 #
-# User-configurable ICU specific options for Android, FreeBSD, Linux and Haiku.
+# User-configurable ICU specific options for Android, FreeBSD, Linux, Haiku, and WebAssembly.
 #
 
-foreach(sdk ANDROID;FREEBSD;LINUX;WINDOWS;HAIKU)
-  foreach(arch aarch64;armv6;armv7;i686;powerpc64;powerpc64le;s390x;x86_64)
+foreach(sdk ANDROID;FREEBSD;LINUX;WINDOWS;HAIKU;WASI)
+  foreach(arch aarch64;armv6;armv7;i686;powerpc64;powerpc64le;s390x;wasm32;x86_64)
     set(SWIFT_${sdk}_${arch}_ICU_UC "" CACHE STRING
         "Path to a directory containing the icuuc library for ${sdk}")
     set(SWIFT_${sdk}_${arch}_ICU_UC_INCLUDE "" CACHE STRING
@@ -595,6 +595,8 @@ else()
     set(SWIFT_HOST_VARIANT_ARCH_default "powerpc64le")
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "s390x")
     set(SWIFT_HOST_VARIANT_ARCH_default "s390x")
+  elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "wasm32")
+    set(SWIFT_HOST_VARIANT_ARCH_default "wasm32")
   # FIXME: Only matches v6l/v7l - by far the most common variants
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "armv6l")
     set(SWIFT_HOST_VARIANT_ARCH_default "armv6")
@@ -779,6 +781,18 @@ if(swift_build_windows AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
   configure_sdk_windows("Windows" "msvc" "${SWIFT_SDK_WINDOWS_ARCHITECTURES}")
 endif()
 
+# Should we cross-compile the standard library for WebAssembly (WASI)?
+is_sdk_requested(WASI swift_build_wasm)
+if(swift_build_wasm AND NOT "${SWIFT_HOST_VARIANT_SDK}" STREQUAL "WASI")
+  if(SWIFT_BUILD_DYNAMIC_SDK_OVERLAY OR SWIFT_BUILD_DYNAMIC_STDLIB)
+    message(FATAL_ERROR "Unable to build dynamic overlay/stdlib for WASI. WASM does not support dynamic linking.")
+  endif()
+  if("${SWIFT_SDK_WASI_ARCHITECTURES}" STREQUAL "")
+    set(SWIFT_SDK_WASI_ARCHITECTURES wasm32)
+  endif()
+  configure_sdk_unix("WASI" "${SWIFT_SDK_WASI_ARCHITECTURES}")
+endif()
+
 if("${SWIFT_SDKS}" STREQUAL "")
   set(SWIFT_SDKS "${SWIFT_CONFIGURED_SDKS}")
 endif()

cmake/modules/AddSwift.cmake

@@ -366,6 +366,8 @@ function(_add_variant_c_compile_flags)
       list(APPEND result -isystem;${path})
     endforeach()
     list(APPEND result "-D__ANDROID_API__=${SWIFT_ANDROID_API_LEVEL}")
+  elseif("${CFLAGS_SDK}" STREQUAL "WASI")
+    list(APPEND result "-D_WASI_EMULATED_MMAN")
   elseif(CFLAGS_SDK STREQUAL WINDOWS)
     swift_windows_include_for_arch(${CFLAGS_ARCH} ${CFLAGS_ARCH}_INCLUDE)
     foreach(path ${${CFLAGS_ARCH}_INCLUDE})
@@ -439,6 +441,8 @@ function(_add_variant_swift_compile_flags
     foreach(path IN LISTS ${arch}_swift_include)
       list(APPEND result "\"${CMAKE_INCLUDE_FLAG_C}${path}\"")
     endforeach()
+  elseif("${sdk}" STREQUAL "WASI")
+    list(APPEND result "-Xcc" "-D_WASI_EMULATED_MMAN")
   endif()
 
   if(NOT BUILD_STANDALONE)
@@ -551,6 +555,8 @@ function(_add_variant_link_flags)
     foreach(path IN LISTS ${LFLAGS_ARCH}_LIB)
       list(APPEND library_search_directories ${path})
     endforeach()
+  elseif("${LFLAGS_SDK}" STREQUAL "WASI")
+    list(APPEND result "-Wl,wasi-emulated-mman")
   else()
     # If lto is enabled, we need to add the object path flag so that the LTO code
     # generator leaves the intermediate object file in a place where it will not
@@ -1072,7 +1078,8 @@ function(_add_swift_library_single target name)
               ${INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS}
               ${SWIFTLIB_SINGLE_XCODE_WORKAROUND_SOURCES})
   if(("${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_OBJECT_FORMAT}" STREQUAL "ELF" OR
-      "${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_OBJECT_FORMAT}" STREQUAL "COFF") AND
+      "${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_OBJECT_FORMAT}" STREQUAL "COFF" OR
+      "${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_OBJECT_FORMAT}" STREQUAL "WASM") AND
      SWIFTLIB_SINGLE_TARGET_LIBRARY)
     if("${libkind}" STREQUAL "SHARED" AND NOT SWIFTLIB_SINGLE_NOSWIFTRT)
       # TODO(compnerd) switch to the generator expression when cmake is upgraded
@@ -1399,6 +1406,12 @@ function(_add_swift_library_single target name)
       list(APPEND c_compile_flags -D_WINDLL)
     endif()
   endif()
+  # Double-check that we're not trying to build a dynamic library for WASM.
+  if(SWIFTLIB_SINGLE_SDK MATCHES WASM)
+    if(libkind STREQUAL SHARED)
+      message(FATAL_ERROR "WASM does not support shared libraries.")
+    endif()
+  endif()
   _add_variant_link_flags(
     SDK "${SWIFTLIB_SINGLE_SDK}"
     ARCH "${SWIFTLIB_SINGLE_ARCHITECTURE}"
@@ -1710,6 +1723,9 @@ endfunction()
 # SWIFT_MODULE_DEPENDS_HAIKU
 #   Swift modules this library depends on when built for Haiku.
 #
+# SWIFT_MODULE_DEPENDS_WASI
+#   Swift modules this library depends on when built for WASI.
+#
 # FRAMEWORK_DEPENDS
 #   System frameworks this library depends on.
 #
@@ -1826,6 +1842,7 @@ function(add_swift_target_library name)
         SWIFT_MODULE_DEPENDS_OSX
         SWIFT_MODULE_DEPENDS_TVOS
         SWIFT_MODULE_DEPENDS_WATCHOS
+	SWIFT_MODULE_DEPENDS_WASI
         SWIFT_MODULE_DEPENDS_WINDOWS
         SWIFT_MODULE_DEPENDS_FROM_SDK
         TARGET_SDKS
@@ -1987,6 +2004,9 @@ function(add_swift_target_library name)
     elseif(${sdk} STREQUAL HAIKU)
       list(APPEND swiftlib_module_depends_flattened
            ${SWIFTLIB_SWIFT_MODULE_DEPENDS_HAIKU})
+    elseif(${sdk} STREQUAL WASI)
+      list(APPEND swiftlib_module_depends_flattened
+           ${SWIFTLIB_SWIFT_MODULE_DEPENDS_WASI})
     elseif(${sdk} STREQUAL WINDOWS)
       list(APPEND swiftlib_module_depends_flattened
            ${SWIFTLIB_SWIFT_MODULE_DEPENDS_WINDOWS})

cmake/modules/SwiftConfigureSDK.cmake

@@ -217,6 +217,8 @@ macro(configure_sdk_unix name architectures)
   set(SWIFT_SDK_${prefix}_ARCHITECTURES "${architectures}")
   if("${prefix}" STREQUAL "CYGWIN")
     set(SWIFT_SDK_${prefix}_OBJECT_FORMAT "COFF")
+  elseif("${prefix}" STREQUAL "WASI")
+    set(SWIFT_SDK_${prefix}_OBJECT_FORMAT "WASM")
   else()
     set(SWIFT_SDK_${prefix}_OBJECT_FORMAT "ELF")
   endif()
@@ -333,6 +335,14 @@ macro(configure_sdk_unix name architectures)
           message(FATAL_ERROR "unsupported arch for Haiku: ${arch}")
         endif()
         set(SWIFT_SDK_HAIKU_ARCH_x86_64_TRIPLE "x86_64-unknown-haiku")
+      elseif("${prefix}" STREQUAL "WASI")
+        if(NOT arch STREQUAL wasm32)
+          message(FATAL_ERROR "unsupported arch for WebAssembly: ${arch}")
+        endif()
+        set(SWIFT_SDK_WASI_ARCH_wasm32_PATH "${SWIFT_WASI_SDK_PATH}/share/wasi-sysroot")
+        set(SWIFT_SDK_WASI_ARCH_wasm32_TRIPLE "wasm32-unknown-wasi")
+        set(SWIFT_SDK_WASI_ARCH_wasm32_LIBC_INCLUDE_DIRECTORY "${SWIFT_WASI_SDK_PATH}/share/wasi-sysroot/include")
+        set(SWIFT_SDK_WASI_ARCH_wasm32_LIBC_ARCHITECTURE_INCLUDE_DIRECTORY "${SWIFT_WASI_SDK_PATH}/share/wasi-sysroot/include")
       else()
         message(FATAL_ERROR "unknown Unix OS: ${prefix}")
       endif()

cmake/modules/SwiftSetIfArchBitness.cmake

@@ -12,7 +12,8 @@ function(set_if_arch_bitness var_name)
      "${SIA_ARCH}" STREQUAL "armv6" OR
      "${SIA_ARCH}" STREQUAL "armv7" OR
      "${SIA_ARCH}" STREQUAL "armv7k" OR
-     "${SIA_ARCH}" STREQUAL "armv7s")
+     "${SIA_ARCH}" STREQUAL "armv7s" OR
+     "${SIA_ARCH}" STREQUAL "wasm32")
     set("${var_name}" "${SIA_CASE_32_BIT}" PARENT_SCOPE)
   elseif("${SIA_ARCH}" STREQUAL "x86_64" OR
          "${SIA_ARCH}" STREQUAL "arm64" OR

include/swift/Basic/Lazy.h

@@ -16,12 +16,18 @@
 #include <memory>
 #ifdef __APPLE__
 #include <dispatch/dispatch.h>
+#elif defined(__wasi__)
+// No pthread on wasi
 #else
 #include <mutex>
 #endif
 #include "swift/Basic/Malloc.h"
 #include "swift/Basic/type_traits.h"
 
+#ifdef __wasi__
+void wasi_polyfill_call_once(int *flag, void *context, void (*func)(void *));
+#endif
+
 namespace swift {
 
 #ifdef __APPLE__
@@ -36,6 +42,10 @@ namespace swift {
   using OnceToken_t = unsigned long;
 # define SWIFT_ONCE_F(TOKEN, FUNC, CONTEXT) \
   _swift_once_f(&TOKEN, CONTEXT, FUNC)
+#elif defined(__wasi__)
+  using OnceToken_t = int;
+# define SWIFT_ONCE_F(TOKEN, FUNC, CONTEXT) \
+  ::wasi_polyfill_call_once(&TOKEN, CONTEXT, FUNC)
 #else
   using OnceToken_t = std::once_flag;
 # define SWIFT_ONCE_F(TOKEN, FUNC, CONTEXT) \

include/swift/Basic/RelativePointer.h

@@ -146,6 +146,11 @@ static inline uintptr_t applyRelativeOffset(BasePtrTy *basePtr, Offset offset) {
                 std::is_signed<Offset>::value,
                 "offset type should be signed integer");
 
+#ifdef __wasm__
+  // WebAssembly: hack: disable relative pointers
+  return (uintptr_t)(intptr_t)offset;
+#endif
+
   auto base = reinterpret_cast<uintptr_t>(basePtr);
   // We want to do wrapping arithmetic, but with a sign-extended
   // offset. To do this in C, we need to do signed promotion to get
@@ -164,6 +169,13 @@ static inline Offset measureRelativeOffset(A *referent, B *base) {
   static_assert(std::is_integral<Offset>::value &&
                 std::is_signed<Offset>::value,
                 "offset type should be signed integer");
+#ifdef __wasm__
+  // WebAssembly: hack: disable relative pointers
+  auto offset = (Offset)(uintptr_t)referent;
+  assert((intptr_t)offset == (intptr_t)(uintptr_t)referent
+         && "pointer too large to fit in offset type");
+  return offset;
+#endif
 
   auto distance = (uintptr_t)referent - (uintptr_t)base;
   // Truncate as unsigned, then wrap around to signed.

include/swift/IRGen/Linking.h

@@ -1157,6 +1157,11 @@ class ApplyIRLinkage {
     // TODO: BFD and gold do not handle COMDATs properly
     if (Triple.isOSBinFormatELF())
       return;
+    // WebAssembly: hack: comdat + custom section = explosion
+    // the comdat code assumes section name would be unique for each comdat
+    // this doesn't happen for metadata.
+    if (Triple.isOSBinFormatWasm())
+      return;
 
     if (IRL.Linkage == llvm::GlobalValue::LinkOnceODRLinkage ||
         IRL.Linkage == llvm::GlobalValue::WeakODRLinkage)

include/swift/Runtime/Mutex.h

@@ -24,6 +24,8 @@
 #include "swift/Runtime/MutexPThread.h"
 #elif defined(_WIN32)
 #include "swift/Runtime/MutexWin32.h"
+#elif defined(__wasi__)
+#include "swift/Runtime/MutexWASI.h"
 #else
 #error "Implement equivalent of MutexPThread.h/cpp for your platform."
 #endif

include/swift/Runtime/MutexPThread.h

@@ -26,7 +26,7 @@ typedef pthread_cond_t ConditionHandle;
 typedef pthread_mutex_t MutexHandle;
 typedef pthread_rwlock_t ReadWriteLockHandle;
 
-#if defined(__CYGWIN__) || defined(__ANDROID__) || defined(__HAIKU__)
+#if defined(__CYGWIN__) || defined(__ANDROID__) || defined(__HAIKU__) || defined(__wasi__)
 // At the moment CYGWIN pthreads implementation doesn't support the use of
 // constexpr for static allocation versions. The way they define things
 // results in a reinterpret_cast which violates constexpr. Similarly, Android's