Update to newer cranelift which also requires an update to wasmparser 0.31.0.

This commit is contained in:
Nick Lewycky 2019-07-01 15:27:17 -07:00
parent 13c5f5e71b
commit fe38cc915b
7 changed files with 13 additions and 12 deletions

View File

@ -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"

View File

@ -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"

View File

@ -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 {

View File

@ -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]

View File

@ -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"

View File

@ -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,
}),

View File

@ -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"