Merge branch 'master' into register-binfmt

yiwei1223 · Nov 5, 2021 · db974ab · db974ab
2 parents de8a663 + e389ad0
commit db974ab
Show file tree

Hide file tree

Showing 170 changed files with 35,339 additions and 2,884 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,24 +1,23 @@
 benches                            @syrusakbary
-examples                           @Hywan @jubianchi
+examples                           
 fuzz                               @syrusakbary
-lib/api                            @syrusakbary @Hywan @MarkMcCaskey
-lib/c-api                          @Hywan @MarkMcCaskey @jubianchi
-lib/cache                          @syrusakbary @Hywan
-lib/cli                            @syrusakbary @MarkMcCaskey
-lib/compiler                       @syrusakbary @nlewycky @losfair @Hywan @MarkMcCaskey
-lib/compiler-cranelift             @nlewycky @syrusakbary
-lib/compiler-llvm                  @nlewycky @losfair
-lib/compiler-singlepass            @losfair @nlewycky
-lib/deprecated                     @Hywan @MarkMcCaskey
-lib/emscripten                     @MarkMcCaskey
-lib/engine                         @syrusakbary @MarkMcCaskey @Hywan
-lib/engine-jit                     @syrusakbary @MarkMcCaskey @Hywan
-lib/engine-native                  @syrusakbary @MarkMcCaskey @Hywan
-lib/engine-object-file             @syrusakbary @MarkMcCaskey @Hywan
-lib/object                         @syrusakbary @nlewycky
-lib/vm                             @syrusakbary @nlewycky @MarkMcCaskey
-lib/wasi                           @MarkMcCaskey
-lib/wasi-experimental-io-devices   @MarkMcCaskey
-lib/wasmer-types                   @syrusakbary @Hywan
+lib/api                            @syrusakbary
+lib/c-api                          
+lib/cache                          @syrusakbary
+lib/cli                            @syrusakbary
+lib/compiler                       @syrusakbary
+lib/compiler-cranelift             @syrusakbary
+lib/compiler-llvm                  
+lib/compiler-singlepass            @syrusakbary
+lib/deprecated                     
+lib/emscripten                     
+lib/engine                         @syrusakbary
+lib/engine-jit                     @syrusakbary
+lib/engine-native                  @syrusakbary
+lib/engine-object-file             @syrusakbary
+lib/object                         @syrusakbary
+lib/vm                             @syrusakbary
+lib/wasi                           
+lib/wasmer-types                   @syrusakbary
 scripts                            @syrusakbary
-tests                              @MarkMcCaskey
+tests                              
diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
@@ -1,10 +1,10 @@
+name: Documentation
+
 on:
   push:
     branches:
       - 'master'
 
-name: Documentation
-
 jobs:
   documentation:
     name: Documentation

diff --git a/.github/workflows/js.yaml → .github/workflows/test-js.yaml b/.github/workflows/js.yaml → .github/workflows/test-js.yaml
@@ -1,3 +1,8 @@
+name: Runtime tests - JS
+
+env:
+  RUST_BACKTRACE: 1
+
 on:
   push:
     branches:
@@ -7,25 +12,31 @@ on:
     tags:
       # this is _not_ a regex, see: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
       - '[0-9]+.[0-9]+.[0-9]+*'
-
-name: wasmer-js tests
-
-env:
-  RUST_BACKTRACE: 1
+  pull_request:
 
 jobs:
-  wasmer-js:
-    name: wasmer-js
+  test:
+    name: Test on NodeJS
+
     runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v2
+
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
           override: true
+
+      - name: Install NodeJS
+        uses: actions/setup-node@v2
+        with:
+          node-version: 16
+
       - name: Install wasm-pack
         run: |
           curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-      - name: Test wasmer-js
+
+      - name: Compile Wasmer to WebAssembly and test with a JavaScript host
         run: make test-js
diff --git a/.github/workflows/main.yaml → .github/workflows/test-sys.yaml b/.github/workflows/main.yaml → .github/workflows/test-sys.yaml
@@ -1,4 +1,4 @@
-name: core tests
+name: Runtime tests
 
 env:
   RUST_BACKTRACE: 1
@@ -12,6 +12,7 @@ on:
     tags:
       # this is _not_ a regex, see: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
       - '[0-9]+.[0-9]+.[0-9]+*'
+  pull_request:
 jobs:
   setup:
     name: Set up
@@ -49,14 +50,15 @@ jobs:
             run_integration_tests: true
             use_sccache: true
           - build: macos-x64
-            os: macos-latest
+            os: macos-11
             llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/11.x/darwin-amd64.tar.gz'
             artifact_name: 'wasmer-darwin-amd64'
             cross_compilation_artifact_name: 'cross_compiled_from_mac'
             run_test: true
             run_test_capi: true
             use_sccache: true
             run_integration_tests: true
+            run_ios_tests: true
           - build: macos-arm64
             os: macos-11.0
             target: aarch64-apple-darwin
@@ -67,7 +69,7 @@ jobs:
           - build: windows-x64
             os: windows-latest
             # llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/11.x/windows-amd64.tar.gz'
-            llvm_choco_version: 11.1.0
+            llvm_choco_version: 12.0.1
             artifact_name: 'wasmer-windows-amd64'
             cross_compilation_artifact_name: 'cross_compiled_from_win'
             run_integration_tests: true
@@ -118,7 +120,7 @@ jobs:
         if: matrix.llvm_choco_version
         shell: bash
         run: |
-          choco install llvm --version ${{ matrix.llvm_choco_version }}
+          choco install llvm --version ${{ matrix.llvm_choco_version }} --allow-downgrade
           cd 'C:\Program Files\LLVM\'
           LLVM_DIR=$(pwd)
           echo "LLVM_SYS_110_PREFIX=${LLVM_DIR}" >> $GITHUB_ENV
@@ -255,6 +257,12 @@ jobs:
           export WASMER_DIR=`pwd`/package
           make test-integration
         if: matrix.run_integration_tests && matrix.os != 'windows-latest'
+      - name: Run iOS integration tests
+        run: |
+          rustup target add aarch64-apple-ios x86_64-apple-ios
+          cargo install cargo-lipo
+          make test-integration-ios
+        if: matrix.run_ios_tests
       - name: Cross compile from Linux
         if: matrix.build == 'linux-x64'
         shell: bash
@@ -268,7 +276,7 @@ jobs:
           #cp qjs_win_from_linux.wjit cross
           cp target/release/wasmer cross
       - name: Cross compile from Mac
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-11'
         shell: bash
         run: |
           ls target/release
@@ -323,7 +331,7 @@ jobs:
   test-cross-compile-on-mac:
     name: Test cross-compile on macos
     needs: [setup, test]
-    runs-on: macos-latest
+    runs-on: macos-11
     steps:
       - name: Download Wasmer
         uses: actions/download-artifact@v2

diff --git a/.gitignore b/.gitignore
@@ -2,13 +2,15 @@
 **/*.rs.bk
 .DS_Store
 .idea
+.gdb_history
 **/.vscode
 api-docs-repo/
 /.cargo_home/
 /package/
 /dist/
 /wapm-cli/
 /src/windows-installer/WasmerInstaller.exe
+/lib/c-api/wasmer.h
 
 # Generated by tests on Android
 /avd

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,23 +9,30 @@ Looking for changes that affect our C API? See the [C API Changelog](lib/c-api/C
 ## **[Unreleased]**
 
 ### Added
-- [#2427](https://github.com/wasmerio/wasmer/pull/2427) Wasmer can now compile to Javascript via `wasm-bindgen`. Use the `js-default` (and no default features) feature to try it!
-- [#2436](https://github.com/wasmerio/wasmer/pull/2436) Added the x86-32 bit variant support to LLVM compiler
+- [#2574](https://github.com/wasmerio/wasmer/pull/2574) Added Windows support to Singlepass.
+- [#2535](https://github.com/wasmerio/wasmer/pull/2435) Added iOS support for Wasmer. This relies on the `dylib-engine`.
+- [#2427](https://github.com/wasmerio/wasmer/pull/2427) Wasmer can now compile to Javascript via `wasm-bindgen`. Use the `js-default` (and no default features) feature to try it!.
+- [#2436](https://github.com/wasmerio/wasmer/pull/2436) Added the x86-32 bit variant support to LLVM compiler.
 - [#2499](https://github.com/wasmerio/wasmer/pull/2499) Added a subcommand to linux wasmer-cli to register wasmer with binfmt_misc
 
+
 ### Changed
-- [#2460](https://github.com/wasmerio/wasmer/pull/2460) **breaking change** `wasmer` API usage with `no-default-features` requires now the `sys` feature to preserve old behavior
-- [#2476](https://github.com/wasmerio/wasmer/pull/2476) Removed unncessary abstraction `ModuleInfoTranslate` from `wasmer-compiler`
-- [#2442](https://github.com/wasmerio/wasmer/pull/2442) Improved `WasmPtr`, added `WasmCell` for host/guest interaction
+- [#2460](https://github.com/wasmerio/wasmer/pull/2460) **breaking change** `wasmer` API usage with `no-default-features` requires now the `sys` feature to preserve old behavior.
+- [#2476](https://github.com/wasmerio/wasmer/pull/2476) Removed unncessary abstraction `ModuleInfoTranslate` from `wasmer-compiler`.
+- [#2442](https://github.com/wasmerio/wasmer/pull/2442) Improved `WasmPtr`, added `WasmCell` for host/guest interaction.
 - [#2427](https://github.com/wasmerio/wasmer/pull/2427) Update `loupe` to 0.1.3.
 - [#2478](https://github.com/wasmerio/wasmer/pull/2478) Rename `wasm_instance_new()`’s “traps” argument to “trap”.
 
 ### Fixed
-- [#2494](https://github.com/wasmerio/wasmer/pull/2494) Fixed `WasmerEnv` access when using `call_indirect` with the Singlepass compiler
-- [#2449](https://github.com/wasmerio/wasmer/pull/2449) Fixed `wasmer-c-api` used `soname`
-- [#2479](https://github.com/wasmerio/wasmer/pull/2479) Improved `wasmer validate` error message on non-wasm inputs
+- [#2599](https://github.com/wasmerio/wasmer/pull/2599) Fixed Universal engine for Linux/Aarch64 target.
+- [#2587](https://github.com/wasmerio/wasmer/pull/2587) Fixed deriving `WasmerEnv` when aliasing `Result`.
+- [#2518](https://github.com/wasmerio/wasmer/pull/2518) Remove temporary file used to creating an artifact when creating a Dylib engine artifact.
+- [#2494](https://github.com/wasmerio/wasmer/pull/2494) Fixed `WasmerEnv` access when using `call_indirect` with the Singlepass compiler.
+- [#2449](https://github.com/wasmerio/wasmer/pull/2449) Fixed `wasmer-c-api` used `soname`.
+- [#2479](https://github.com/wasmerio/wasmer/pull/2479) Improved `wasmer validate` error message on non-wasm inputs.
 - [#2454](https://github.com/wasmerio/wasmer/issues/2454) Won't set `WASMER_CACHE_DIR` for Windows.
 - [#2426](https://github.com/wasmerio/wasmer/pull/2426) Fix the `wax` script generation.
+- [#2635](https://github.com/wasmerio/wasmer/pull/2635) Fix cross-compilation for singlepass.
 
 ## 2.0.0 - 2021/06/16
 
@@ -189,9 +196,9 @@ This change is unlikely to affect any users of `wasmer`, but if it does please c
 ## 1.0.0-beta2 - 2020-12-16
 
 ### Added
- 
+
 * [#1916](https://github.com/wasmerio/wasmer/pull/1916) Add the `WASMER_VERSION*` constants with the `wasmer_version*` functions in the Wasmer C API
-* [#1867](https://github.com/wasmerio/wasmer/pull/1867) Added `Metering::get_remaining_points` and `Metering::set_remaining_points` 
+* [#1867](https://github.com/wasmerio/wasmer/pull/1867) Added `Metering::get_remaining_points` and `Metering::set_remaining_points`
 * [#1881](https://github.com/wasmerio/wasmer/pull/1881) Added `UnsupportedTarget` error to `CompileError`
 * [#1908](https://github.com/wasmerio/wasmer/pull/1908) Implemented `TryFrom<Value<T>>` for `i32`/`u32`/`i64`/`u64`/`f32`/`f64`
 * [#1927](https://github.com/wasmerio/wasmer/pull/1927) Added mmap support in `Engine::deserialize_from_file` to speed up artifact loading