Merge branch 'master' into feature/trampoline-in-artifact

nlewycky · nlewycky · commit 57202f7522fa · 2020-10-15T17:03:44.000-07:00
diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml
@@ -35,7 +35,7 @@ jobs:
         # that are needed during the build process. Additionally, this works
         # around a bug in the 'cache' action that causes directories outside of
         # the workspace dir to be saved/restored incorrectly.
-        run: echo "::set-env name=CARGO_HOME::$(pwd)/.cargo_home"
+        run: echo "CARGO_HOME=$(pwd)/.cargo_home" >> $GITHUB_ENV
       - name: Cache
         uses: actions/cache@master
         with:
@@ -56,8 +56,8 @@ jobs:
           curl --proto '=https' --tlsv1.2 -sSf https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz -L -o llvm.tar.xz
           mkdir -p /opt/llvm-10
           tar xf llvm.tar.xz --strip-components=1 -C /opt/llvm-10
-          echo ::add-path::/opt/llvm-10/bin
-          echo ::set-env name=LLVM_SYS_100_PREFIX::/opt/llvm-10
+          echo '/opt/llvm-10/bin' >> $GITHUB_PATH
+          echo 'name=LLVM_SYS_100_PREFIX=/opt/llvm-10' >> $GITHUB_ENV
       - name: Install Python
         uses: actions/setup-python@v2
         with:
diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
@@ -29,8 +29,8 @@ jobs:
           curl --proto '=https' --tlsv1.2 -sSf https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz -L -o llvm.tar.xz
           mkdir -p /opt/llvm-10
           tar xf llvm.tar.xz --strip-components=1 -C /opt/llvm-10
-          echo ::add-path::/opt/llvm-10/bin
-          echo ::set-env name=LLVM_SYS_100_PREFIX::/opt/llvm-10
+          echo '/opt/llvm-10/bin' >> $GITHUB_PATH
+          echo 'LLVM_SYS_100_PREFIX=/opt/llvm-10' >> $GITHUB_ENV
       - name: Generate Coverage Report
         run: |
           cargo install cargo-tarpaulin
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -81,7 +81,7 @@ jobs:
         # that are needed during the build process. Additionally, this works
         # around a bug in the 'cache' action that causes directories outside of
         # the workspace dir to be saved/restored incorrectly.
-        run: echo "::set-env name=CARGO_HOME::$(pwd)/.cargo_home"
+        run: echo "CARGO_HOME=$(pwd)/.cargo_home" >> $GITHUB_ENV
       - name: Cache
         uses: actions/cache@master
         with:
@@ -103,13 +103,13 @@ jobs:
       #     key: cargo-sccache-bin-${{ env.CARGO_SCCACHE_VERSION }}
       # - name: Install sccache
       #   run: |
-      #     echo "::add-path::${{ runner.tool_cache }}/cargo-sccache/bin"
+      #     echo "${{ runner.tool_cache }}/cargo-sccache/bin" >> $GITHUB_PATH
       #     cargo install sccache --version ${{ env.CARGO_SCCACHE_VERSION }} --root ${{ runner.tool_cache }}/cargo-sccache
       # - name: Start sccache
       #   run: |
       #     ${{ runner.tool_cache }}/cargo-sccache/bin/sccache --start-server
       #     ${{ runner.tool_cache }}/cargo-sccache/bin/sscache -s
-      #     echo "::set-env name=RUSTC_WRAPPER::${{ runner.tool_cache }}/cargo-sccache/bin/sccache"
+      #     echo "RUSTC_WRAPPER=${{ runner.tool_cache }}/cargo-sccache/bin/sccache" >> $GITHUB_ENV
       - name: Install LLVM (Windows)
         if: matrix.os == 'windows-latest'
         shell: cmd
@@ -118,17 +118,17 @@ jobs:
         # run: |
         #   curl --proto '=https' --tlsv1.2 -sSf https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/LLVM-10.0.0-win64.exe -L -o llvm-installer.exe
         #   7z x llvm-installer.exe -oC:/llvm-10
-        #   echo ::add-path::C:/llvm-10/bin
-        #   echo ::set-env name=LLVM_SYS_100_PREFIX::C:/llvm-10
-        #   echo ::set-env name=LIBCLANG_PATH::C:/llvm-10/bin/libclang.dll
+        #   echo C:/llvm-10/bin >> $GITHUB_PATH
+        #   echo "LLVM_SYS_100_PREFIX=C:/llvm-10" >> $GITHUB_ENV
+        #   echo "LIBCLANG_PATH=C:/llvm-10/bin/libclang.dll" >> $GITHUB_ENV
       - name: Install LLVM (Unix)
         if: matrix.os != 'windows-latest'
         run: |
           curl --proto '=https' --tlsv1.2 -sSf ${{ matrix.llvm_url }} -L -o llvm.tar.xz
           mkdir -p ${{ env.LLVM_DIR }}
           tar xf llvm.tar.xz --strip-components=1 -C ${{ env.LLVM_DIR }}
-          echo "::add-path::${{ env.LLVM_DIR }}/bin"
-          echo "::set-env name=LLVM_SYS_100_PREFIX::${{ env.LLVM_DIR }}"
+          echo "${{ env.LLVM_DIR }}/bin" >> $GITHUB_PATH
+          echo "LLVM_SYS_100_PREFIX=${{ env.LLVM_DIR }}" >> $GITHUB_ENV
         env:
           LLVM_DIR: ${{ github.workspace }}/llvm-10
       - name: Set up dependencies for Mac OS
@@ -248,7 +248,7 @@ jobs:
           path: ${{ runner.tool_cache }}/cargo-audit
           key: cargo-audit-bin-${{ env.CARGO_AUDIT_VERSION }}
       - run: |
-          echo "::add-path::${{ runner.tool_cache }}/cargo-audit/bin"
+          echo "${{ runner.tool_cache }}/cargo-audit/bin" >> $GITHUB_PATH
       - run: |
           cargo install cargo-audit --version ${{ env.CARGO_AUDIT_VERSION }} --root ${{ runner.tool_cache }}/cargo-audit
           cargo audit
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,9 +10,14 @@
 - [#1710](https://github.com/wasmerio/wasmer/pull/1710) Memory for function call trampolines is now owned by the Artifact.
 ### Added
 
+- [#1715](https://github.com/wasmerio/wasmer/pull/1715) Register errors from `wasm_module_serialize` in the Wasm C API.
 - [#1709](https://github.com/wasmerio/wasmer/pull/1709) Implement `wasm_module_name` and `wasm_module_set_name` in the Wasm(er) C API.
 - [#1700](https://github.com/wasmerio/wasmer/pull/1700) Implement `wasm_externtype_copy` in the Wasm C API.
 
+### Fixed
+
+- [#1718](https://github.com/wasmerio/wasmer/pull/1718) Fix panic in the API in some situations when the memory's min bound was greater than the memory's max bound.
+
 ## 1.0.0-alpha4 - 2020-10-08
 
 ### Added
diff --git a/Cargo.toml b/Cargo.toml
@@ -131,9 +131,11 @@ test-llvm = [
 
 test-native = [
     "native",
+    "test-generator/test-native",
 ]
 test-jit = [
     "jit",
+    "test-generator/test-jit",
 ]
 
 # Specifies that we're running in coverage testing mode. This disables tests
diff --git a/Makefile b/Makefile
@@ -8,11 +8,13 @@ else
 	UNAME_S := 
 endif
 
-compilers :=
+# Which compilers we build. These have dependencies that may not on the system.
+compilers := cranelift
+
+# Which engines we test. We always build all engines.
+engines := jit
 
 ifeq ($(ARCH), x86_64)
-	# In X64, Cranelift is enabled
-	compilers += cranelift
 	# LLVM could be enabled if not in Windows
 	ifneq ($(OS), Windows_NT)
 		# Singlepass doesn't work yet on Windows
@@ -29,10 +31,14 @@ ifeq ($(ARCH), x86_64)
 				compilers += llvm
 			endif
 		endif
+
+		# Native engine doesn't work yet on Windows
+		engines += native
 	endif
 endif
 
 compilers := $(filter-out ,$(compilers))
+engines := $(filter-out ,$(engines))
 
 ifneq ($(OS), Windows_NT)
 	bold := $(shell tput bold)
@@ -94,7 +100,7 @@ build-capi-llvm:
 # Testing #
 ###########
 
-test: $(foreach compiler,$(compilers),test-$(compiler)-jit) test-packages test-examples test-deprecated
+test: $(foreach engine,$(engines),$(foreach compiler,$(compilers),test-$(compiler)-$(engine))) test-packages test-examples test-deprecated
 
 # Singlepass and native engine don't work together, this rule does nothing.
 test-singlepass-native:
diff --git a/examples/engine_headless.rs b/examples/engine_headless.rs
@@ -147,7 +147,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 #[test]
-#[cfg(not(windows))]
+#[cfg(not(any(windows, target_arch = "aarch64")))]
 fn test_engine_headless() -> Result<(), Box<dyn std::error::Error>> {
     main()
 }
diff --git a/examples/engine_native.rs b/examples/engine_native.rs
@@ -87,6 +87,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 #[test]
+#[cfg(not(target_arch = "aarch64"))]
 fn test_engine_native() -> Result<(), Box<dyn std::error::Error>> {
     main()
 }
diff --git a/lib/api/src/tunables.rs b/lib/api/src/tunables.rs
@@ -1,5 +1,4 @@
 use crate::{MemoryType, Pages, TableType};
-use more_asserts::assert_ge;
 use std::cmp::min;
 use std::sync::Arc;
 use target_lexicon::{OperatingSystem, PointerWidth};
@@ -67,7 +66,6 @@ impl BaseTunables for Tunables {
         // If the module doesn't declare an explicit maximum treat it as 4GiB.
         let maximum = memory.maximum.unwrap_or_else(Pages::max_value);
         if maximum <= self.static_memory_bound {
-            assert_ge!(self.static_memory_bound, memory.minimum);
             MemoryStyle::Static {
                 bound: self.static_memory_bound,
                 offset_guard_size: self.static_memory_offset_guard_size,
diff --git a/lib/c-api/src/wasm_c_api/module.rs b/lib/c-api/src/wasm_c_api/module.rs
@@ -108,7 +108,10 @@ pub unsafe extern "C" fn wasm_module_serialize(
 ) {
     let byte_vec = match module.inner.serialize() {
         Ok(byte_vec) => byte_vec,
-        Err(_) => return,
+        Err(err) => {
+            crate::error::update_last_error(err);
+            return;
+        }
     };
     *out_ptr = byte_vec.into();
 }
diff --git a/lib/c-api/tests/wasm_c_api/test-memory.c b/lib/c-api/tests/wasm_c_api/test-memory.c
@@ -62,6 +62,66 @@ int main(int argc, const char *argv[]) {
   wasm_memorytype_delete(memtype3);
   wasm_memory_delete(memory3);
 
+  // =====================
+  wasm_limits_t limits4 = {
+    .min = 0x7FFFFFFF,
+    .max = 0x7FFFFFFF,
+  };
+  own wasm_memorytype_t* memtype4 = wasm_memorytype_new(&limits4);
+  own wasm_memory_t* memory4 = wasm_memory_new(store, memtype4);
+  assert(memory4 == NULL);
+  error = get_wasmer_error();
+  printf("Found error string: %s\n", error);
+  assert(0 == strcmp("The minimum requested (2147483647 pages) memory is greater than the maximum allowed memory (65536 pages)", error));
+  free(error);
+
+  wasm_memorytype_delete(memtype4);
+
+  // =====================
+  wasm_limits_t limits5 = {
+    .min = 0x7FFFFFFF,
+    .max = 0x0FFFFFFF,
+  };
+  own wasm_memorytype_t* memtype5 = wasm_memorytype_new(&limits5);
+  own wasm_memory_t* memory5 = wasm_memory_new(store, memtype5);
+  assert(memory5 == NULL);
+  error = get_wasmer_error();
+  printf("Found error string: %s\n", error);
+  assert(0 == strcmp("The minimum requested (2147483647 pages) memory is greater than the maximum allowed memory (65536 pages)", error));
+  free(error);
+
+  wasm_memorytype_delete(memtype5);
+
+  // =====================
+  wasm_limits_t limits6 = {
+    .min = 15,
+    .max = 10,
+  };
+  own wasm_memorytype_t* memtype6 = wasm_memorytype_new(&limits6);
+  own wasm_memory_t* memory6 = wasm_memory_new(store, memtype6);
+  assert(memory6 == NULL);
+  error = get_wasmer_error();
+  printf("Found error string: %s\n", error);
+  assert(0 == strcmp("The memory is invalid because the maximum (10 pages) is less than the minimum (15 pages)", error));
+  free(error);
+
+  wasm_memorytype_delete(memtype6);
+
+  // =====================
+  wasm_limits_t limits7 = {
+    .min = 0x7FFFFFFF,
+    .max = 10,
+  };
+  own wasm_memorytype_t* memtype7 = wasm_memorytype_new(&limits7);
+  own wasm_memory_t* memory7 = wasm_memory_new(store, memtype7);
+  assert(memory7 == NULL);
+  error = get_wasmer_error();
+  printf("Found error string: %s\n", error);
+  assert(0 == strcmp("The minimum requested (2147483647 pages) memory is greater than the maximum allowed memory (65536 pages)", error));
+  free(error);
+
+  wasm_memorytype_delete(memtype7);
+
   printf("Shutting down...\n");
   wasm_store_delete(store);
   wasm_engine_delete(engine);
diff --git a/lib/compiler-cranelift/Cargo.toml b/lib/compiler-cranelift/Cargo.toml
@@ -15,7 +15,7 @@ edition = "2018"
 wasmer-compiler = { path = "../compiler", version = "1.0.0-alpha4", features = ["translator"], default-features = false }
 wasmer-vm = { path = "../vm", version = "1.0.0-alpha4" }
 wasmer-types = { path = "../wasmer-types", version = "1.0.0-alpha4", default-features = false, features = ["std"] }
-cranelift-codegen = { version = "0.65", default-features = false }
+cranelift-codegen = { version = "0.65", default-features = false, features = ["x86", "arm64"] }
 cranelift-frontend = { version = "0.65", default-features = false }
 tracing = "0.1"
 hashbrown = { version = "0.8", optional = true }
diff --git a/tests/compilers/traps.rs b/tests/compilers/traps.rs
@@ -38,7 +38,14 @@ fn test_trap_return() -> Result<()> {
 }
 
 #[test]
-#[cfg_attr(feature = "test-singlepass", ignore)]
+#[cfg_attr(
+    any(
+        feature = "test-singlepass",
+        feature = "test-native",
+        target_arch = "aarch64",
+    ),
+    ignore
+)]
 fn test_trap_trace() -> Result<()> {
     let store = get_store();
     let wat = r#"
@@ -118,7 +125,14 @@ fn test_trap_trace_cb() -> Result<()> {
 }
 
 #[test]
-#[cfg_attr(feature = "test-singlepass", ignore)]
+#[cfg_attr(
+    any(
+        feature = "test-singlepass",
+        feature = "test-native",
+        target_arch = "aarch64",
+    ),
+    ignore
+)]
 fn test_trap_stack_overflow() -> Result<()> {
     let store = get_store();
     let wat = r#"
@@ -149,7 +163,15 @@ fn test_trap_stack_overflow() -> Result<()> {
 }
 
 #[test]
-#[cfg_attr(any(feature = "test-singlepass", feature = "test-llvm"), ignore)]
+#[cfg_attr(
+    any(
+        feature = "test-singlepass",
+        feature = "test-llvm",
+        feature = "test-native",
+        target_arch = "aarch64",
+    ),
+    ignore
+)]
 fn trap_display_pretty() -> Result<()> {
     let store = get_store();
     let wat = r#"
@@ -182,7 +204,15 @@ RuntimeError: unreachable
 }
 
 #[test]
-#[cfg_attr(any(feature = "test-singlepass", feature = "test-llvm"), ignore)]
+#[cfg_attr(
+    any(
+        feature = "test-singlepass",
+        feature = "test-llvm",
+        feature = "test-native",
+        target_arch = "aarch64",
+    ),
+    ignore
+)]
 fn trap_display_multi_module() -> Result<()> {
     let store = get_store();
     let wat = r#"
@@ -387,7 +417,14 @@ fn mismatched_arguments() -> Result<()> {
 }
 
 #[test]
-#[cfg_attr(any(feature = "test-singlepass", feature = "test-llvm"), ignore)]
+#[cfg_attr(
+    any(
+        feature = "test-singlepass",
+        feature = "test-llvm",
+        feature = "test-native"
+    ),
+    ignore
+)]
 fn call_signature_mismatch() -> Result<()> {
     let store = get_store();
     let binary = r#"
@@ -418,7 +455,15 @@ RuntimeError: indirect call type mismatch
 }
 
 #[test]
-#[cfg_attr(any(feature = "test-singlepass", feature = "test-llvm"), ignore)]
+#[cfg_attr(
+    any(
+        feature = "test-singlepass",
+        feature = "test-llvm",
+        feature = "test-native",
+        target_arch = "aarch64",
+    ),
+    ignore
+)]
 fn start_trap_pretty() -> Result<()> {
     let store = get_store();
     let wat = r#"
@@ -450,6 +495,7 @@ RuntimeError: unreachable
 }
 
 #[test]
+#[cfg_attr(feature = "test-native", ignore)]
 fn present_after_module_drop() -> Result<()> {
     let store = get_store();
     let module = Module::new(&store, r#"(func (export "foo") unreachable)"#)?;
diff --git a/tests/compilers/wast.rs b/tests/compilers/wast.rs
diff --git a/tests/ignores.txt b/tests/ignores.txt
diff --git a/tests/lib/test-generator/Cargo.toml b/tests/lib/test-generator/Cargo.toml
diff --git a/tests/lib/test-generator/src/lib.rs b/tests/lib/test-generator/src/lib.rs
diff --git a/tests/lib/wast/src/wast.rs b/tests/lib/wast/src/wast.rs

Original file line number	Diff line number	Diff line change
`@@ -131,9 +131,11 @@ test-llvm = [`
`131`	`131`
`132`	`132`	`test-native = [`
`133`	`133`	`"native",`
	`134`	`+ "test-generator/test-native",`
`134`	`135`	`]`
`135`	`136`	`test-jit = [`
`136`	`137`	`"jit",`
	`138`	`+ "test-generator/test-jit",`
`137`	`139`	`]`
`138`	`140`
`139`	`141`	`# Specifies that we're running in coverage testing mode. This disables tests`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`#[test]`
`150`		`-#[cfg(not(windows))]`
	`150`	`+#[cfg(not(any(windows, target_arch = "aarch64")))]`
`151`	`151`	`fn test_engine_headless() -> Result<(), Box<dyn std::error::Error>> {`
`152`	`152`	`main()`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`#[test]`
	`90`	`+#[cfg(not(target_arch = "aarch64"))]`
`90`	`91`	`fn test_engine_native() -> Result<(), Box<dyn std::error::Error>> {`
`91`	`92`	`main()`
`92`	`93`	`}`