From fe38cc915b1118fc59a41e2209ea8767449c2267 Mon Sep 17 00:00:00 2001
From: Nick Lewycky <nick@wasmer.io>
Date: Mon, 1 Jul 2019 15:27:17 -0700
Subject: [PATCH] Update to newer cranelift which also requires an update to
 wasmparser 0.31.0.

---
 lib/clif-backend/Cargo.toml           | 12 ++++++------
 lib/llvm-backend/Cargo.toml           |  2 +-
 lib/middleware-common/src/metering.rs |  4 ++--
 lib/runtime-abi/Cargo.toml            |  2 +-
 lib/runtime-core/Cargo.toml           |  2 +-
 lib/runtime-core/src/parse.rs         |  1 +
 lib/singlepass-backend/Cargo.toml     |  2 +-
 7 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/lib/clif-backend/Cargo.toml b/lib/clif-backend/Cargo.toml
index 0cb1511f9..43c7a51bf 100644
--- a/lib/clif-backend/Cargo.toml
+++ b/lib/clif-backend/Cargo.toml
@@ -9,14 +9,14 @@ edition = "2018"
 
 [dependencies]
 wasmer-runtime-core = { path = "../runtime-core", version = "0.5.1" }
-cranelift-native = { git = "https://github.com/wasmerio/cranelift.git", rev = "84ec31b0fdfc10db491ef950815ee2961db057cb" }
-cranelift-codegen = { git = "https://github.com/wasmerio/cranelift.git", rev = "84ec31b0fdfc10db491ef950815ee2961db057cb" }
-cranelift-entity = { git = "https://github.com/wasmerio/cranelift.git", rev = "84ec31b0fdfc10db491ef950815ee2961db057cb" }
-cranelift-frontend = { git = "https://github.com/wasmerio/cranelift.git", rev = "84ec31b0fdfc10db491ef950815ee2961db057cb" }
-cranelift-wasm = { git = "https://github.com/wasmerio/cranelift.git", rev = "84ec31b0fdfc10db491ef950815ee2961db057cb" }
+cranelift-native = { git = "https://github.com/wasmerio/cranelift.git", rev = "2af151541063384edeaa3f014d00597356f73901" }
+cranelift-codegen = { git = "https://github.com/wasmerio/cranelift.git", rev = "2af151541063384edeaa3f014d00597356f73901" }
+cranelift-entity = { git = "https://github.com/wasmerio/cranelift.git", rev = "2af151541063384edeaa3f014d00597356f73901" }
+cranelift-frontend = { git = "https://github.com/wasmerio/cranelift.git", rev = "2af151541063384edeaa3f014d00597356f73901" }
+cranelift-wasm = { git = "https://github.com/wasmerio/cranelift.git", rev = "2af151541063384edeaa3f014d00597356f73901" }
 hashbrown = "0.1"
 target-lexicon = "0.4.0"
-wasmparser = "0.29.2"
+wasmparser = "0.31.0"
 byteorder = "1"
 nix = "0.13.0"
 libc = "0.2.49"
diff --git a/lib/llvm-backend/Cargo.toml b/lib/llvm-backend/Cargo.toml
index b84273e62..4aca5d4d1 100644
--- a/lib/llvm-backend/Cargo.toml
+++ b/lib/llvm-backend/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 wasmer-runtime-core = { path = "../runtime-core", version = "0.5.1" }
 inkwell = { git = "https://github.com/wasmerio/inkwell", branch = "llvm7-0" }
-wasmparser = "0.29.2"
+wasmparser = "0.31.0"
 hashbrown = "0.1.8"
 smallvec = "0.6.8"
 goblin = "0.0.20"
diff --git a/lib/middleware-common/src/metering.rs b/lib/middleware-common/src/metering.rs
index dd5b856b5..12d4ab240 100644
--- a/lib/middleware-common/src/metering.rs
+++ b/lib/middleware-common/src/metering.rs
@@ -2,7 +2,7 @@ use wasmer_runtime_core::{
     codegen::{Event, EventSink, FunctionMiddleware, InternalEvent},
     module::ModuleInfo,
     vm::{Ctx, InternalField},
-    wasmparser::{Operator, Type as WpType},
+    wasmparser::{Operator, Type as WpType, TypeOrFuncType as WpTypeOrFuncType},
     Instance,
 };
 
@@ -92,7 +92,7 @@ impl FunctionMiddleware for Metering {
                         }));
                         sink.push(Event::WasmOwned(Operator::I64GeU));
                         sink.push(Event::WasmOwned(Operator::If {
-                            ty: WpType::EmptyBlockType,
+                            ty: WpTypeOrFuncType::Type(WpType::EmptyBlockType),
                         }));
                         sink.push(Event::Internal(InternalEvent::Breakpoint(Box::new(
                             move |ctx| unsafe {
diff --git a/lib/runtime-abi/Cargo.toml b/lib/runtime-abi/Cargo.toml
index 4deb4d7b3..7a4496812 100644
--- a/lib/runtime-abi/Cargo.toml
+++ b/lib/runtime-abi/Cargo.toml
@@ -13,7 +13,7 @@ wasmer-runtime-core = { path = "../runtime-core" }
 hashbrown = "0.1"
 failure = "0.1"
 tar = "0.4"
-wasmparser = "0.29.2"
+wasmparser = "0.31.0"
 zstd = "0.4"
 
 # [target.'cfg(unix)'.dependencies.zbox]
diff --git a/lib/runtime-core/Cargo.toml b/lib/runtime-core/Cargo.toml
index 581dff744..9394166a3 100644
--- a/lib/runtime-core/Cargo.toml
+++ b/lib/runtime-core/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 [dependencies]
 nix = "0.12.0"
 page_size = "0.4.1"
-wasmparser = "0.29.2"
+wasmparser = "0.31.0"
 parking_lot = "0.7.1"
 lazy_static = "1.2.0"
 indexmap = "1.0.2"
diff --git a/lib/runtime-core/src/parse.rs b/lib/runtime-core/src/parse.rs
index 7a76a46ac..b3bf141ae 100644
--- a/lib/runtime-core/src/parse.rs
+++ b/lib/runtime-core/src/parse.rs
@@ -93,6 +93,7 @@ pub fn read_module<
                 enable_reference_types: false,
                 enable_simd: false,
                 enable_bulk_memory: false,
+                enable_multi_value: false,
             },
             mutable_global_imports: false,
         }),
diff --git a/lib/singlepass-backend/Cargo.toml b/lib/singlepass-backend/Cargo.toml
index e9de70882..55cba69c1 100644
--- a/lib/singlepass-backend/Cargo.toml
+++ b/lib/singlepass-backend/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 
 [dependencies]
 wasmer-runtime-core = { path = "../runtime-core", version = "0.5.1" }
-wasmparser = "0.29.2"
+wasmparser = "0.31.0"
 dynasm = "0.3.2"
 dynasmrt = "0.3.1"
 lazy_static = "1.2.0"