From 4a50d7b71cd8223f5a67151f995f4a1f72128d10 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 4 Feb 2019 08:30:40 +0000 Subject: [PATCH 1/3] Update parity-wasm requirement from 0.35 to 0.36 Updates the requirements on [parity-wasm](https://github.com/paritytech/parity-wasm) to permit the latest version. - [Release notes](https://github.com/paritytech/parity-wasm/releases) - [Commits](https://github.com/paritytech/parity-wasm/commits) Signed-off-by: dependabot[bot] --- crates/cli/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 7d78da07..613308b0 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -18,7 +18,7 @@ docopt = "1.0" env_logger = "0.6" failure = "0.1.2" log = "0.4" -parity-wasm = "0.35" +parity-wasm = "0.36" rouille = { version = "3.0.0", default-features = false } serde = "1.0" serde_derive = "1.0" From ef379865413a2a36f7e4f1ddc554feb062ba3e2f Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 4 Feb 2019 22:06:10 -0800 Subject: [PATCH 2/3] Update more parity-wasm --- crates/cli-support/Cargo.toml | 2 +- crates/gc/Cargo.toml | 2 +- crates/threads-xform/Cargo.toml | 2 +- crates/wasm-interpreter/Cargo.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/cli-support/Cargo.toml b/crates/cli-support/Cargo.toml index c65e2676..62a6bb7f 100644 --- a/crates/cli-support/Cargo.toml +++ b/crates/cli-support/Cargo.toml @@ -13,7 +13,7 @@ Shared support for the wasm-bindgen-cli package, an internal dependency [dependencies] base64 = "0.9" failure = "0.1.2" -parity-wasm = "0.35" +parity-wasm = "0.36" tempfile = "3.0" wasm-bindgen-gc = { path = '../gc', version = '=0.2.33' } wasm-bindgen-shared = { path = "../shared", version = '=0.2.33' } diff --git a/crates/gc/Cargo.toml b/crates/gc/Cargo.toml index 2bf20eb0..b21961e1 100644 --- a/crates/gc/Cargo.toml +++ b/crates/gc/Cargo.toml @@ -11,7 +11,7 @@ Support for removing unused items from a wasm executable """ [dependencies] -parity-wasm = "0.35.1" +parity-wasm = "0.36" log = "0.4" rustc-demangle = "0.1.9" diff --git a/crates/threads-xform/Cargo.toml b/crates/threads-xform/Cargo.toml index 78f786e2..1d6cc407 100644 --- a/crates/threads-xform/Cargo.toml +++ b/crates/threads-xform/Cargo.toml @@ -11,5 +11,5 @@ Support for threading-related transformations in wasm-bindgen """ [dependencies] -parity-wasm = "0.35" +parity-wasm = "0.36" failure = "0.1" diff --git a/crates/wasm-interpreter/Cargo.toml b/crates/wasm-interpreter/Cargo.toml index a4bcf74c..8c59b19c 100644 --- a/crates/wasm-interpreter/Cargo.toml +++ b/crates/wasm-interpreter/Cargo.toml @@ -11,7 +11,7 @@ Micro-interpreter optimized for wasm-bindgen's use case """ [dependencies] -parity-wasm = "0.35" +parity-wasm = "0.36" [dev-dependencies] tempfile = "3" From 3de5253554a10265b244b320cdbff77ef52d3891 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 4 Feb 2019 22:24:08 -0800 Subject: [PATCH 3/3] Remove passive segment tests for now --- crates/gc/src/lib.rs | 4 +++ .../wat/remove-passive-memory-segment.wat | 18 ----------- crates/gc/tests/wat/renumber-data-segment.wat | 29 ----------------- .../gc/tests/wat/renumber-passive-segment.wat | 32 ------------------- 4 files changed, 4 insertions(+), 79 deletions(-) delete mode 100644 crates/gc/tests/wat/remove-passive-memory-segment.wat delete mode 100644 crates/gc/tests/wat/renumber-data-segment.wat delete mode 100644 crates/gc/tests/wat/renumber-passive-segment.wat diff --git a/crates/gc/src/lib.rs b/crates/gc/src/lib.rs index ec4a459c..851380e4 100644 --- a/crates/gc/src/lib.rs +++ b/crates/gc/src/lib.rs @@ -99,6 +99,10 @@ fn run(config: &mut Config, module: &mut Module) { info!("skipping reloc section"); continue; } + Section::DataCount(..) => { + info!("skipping data count section"); + continue; + } Section::Type(ref mut s) => cx.remap_type_section(s), Section::Import(ref mut s) => cx.remap_import_section(s), Section::Function(ref mut s) => cx.remap_function_section(s), diff --git a/crates/gc/tests/wat/remove-passive-memory-segment.wat b/crates/gc/tests/wat/remove-passive-memory-segment.wat deleted file mode 100644 index 5c8d92d5..00000000 --- a/crates/gc/tests/wat/remove-passive-memory-segment.wat +++ /dev/null @@ -1,18 +0,0 @@ -(module - (memory 0 10) - - (func $foo - i32.const 0 - i32.const 0 - i32.const 0 - memory.init 0 - ) - - (data passive "wut") - - ) - -;; STDOUT (update this section with `BLESS_TESTS=1` while running tests) -;; (module -;; (memory (;0;) 0 10)) -;; STDOUT diff --git a/crates/gc/tests/wat/renumber-data-segment.wat b/crates/gc/tests/wat/renumber-data-segment.wat deleted file mode 100644 index 199086ea..00000000 --- a/crates/gc/tests/wat/renumber-data-segment.wat +++ /dev/null @@ -1,29 +0,0 @@ -(module - (memory 0 10) - - (func $foo - i32.const 0 - i32.const 0 - i32.const 0 - memory.init 1 - ) - - (data passive "wut") - (data passive "wut2") - (data passive "wut3") - - (start $foo) - ) - -;; STDOUT (update this section with `BLESS_TESTS=1` while running tests) -;; (module -;; (type (;0;) (func)) -;; (func $foo (type 0) -;; i32.const 0 -;; i32.const 0 -;; i32.const 0 -;; memory.init 0) -;; (memory (;0;) 0 10) -;; (start 0) -;; (data (;0;) passive "wut2")) -;; STDOUT diff --git a/crates/gc/tests/wat/renumber-passive-segment.wat b/crates/gc/tests/wat/renumber-passive-segment.wat deleted file mode 100644 index f459ae39..00000000 --- a/crates/gc/tests/wat/renumber-passive-segment.wat +++ /dev/null @@ -1,32 +0,0 @@ -(module - (import "" "" (table 0 1 anyfunc)) - - (func $foo - i32.const 0 - i32.const 0 - i32.const 0 - table.init 1 - ) - - (func $bar) - (func $bar2) - - (elem passive $bar) - (elem passive $bar2) - - (start $foo) - ) - -;; STDOUT (update this section with `BLESS_TESTS=1` while running tests) -;; (module -;; (type (;0;) (func)) -;; (import "" "" (table (;0;) 0 1 anyfunc)) -;; (func $foo (type 0) -;; i32.const 0 -;; i32.const 0 -;; i32.const 0 -;; table.init 0) -;; (func $bar2 (type 0)) -;; (start 0) -;; (elem (;0;) passive $bar2)) -;; STDOUT