diff --git a/lib/wasm/src/environ/dummy.rs b/lib/wasm/src/environ/dummy.rs index 229e2a7274..d1e6a8052c 100644 --- a/lib/wasm/src/environ/dummy.rs +++ b/lib/wasm/src/environ/dummy.rs @@ -206,7 +206,7 @@ impl<'dummy_environment> FuncEnvironment for DummyFuncEnvironment<'dummy_environ let bound_gv = func.create_global_value(ir::GlobalValueData::Load { base: vmctx, offset: Offset32::new(0), - global_type: self.pointer_type(), + global_type: I32, }); func.create_table(ir::TableData { diff --git a/lib/wasm/tests/wasm_testsuite.rs b/lib/wasm/tests/wasm_testsuite.rs index 06d7da4e7b..a64ec63e6b 100644 --- a/lib/wasm/tests/wasm_testsuite.rs +++ b/lib/wasm/tests/wasm_testsuite.rs @@ -4,6 +4,7 @@ extern crate cranelift_wasm; extern crate target_lexicon; extern crate wabt; +use cranelift_codegen::isa; use cranelift_codegen::print_errors::pretty_verifier_error; use cranelift_codegen::settings::{self, Configurable, Flags}; use cranelift_codegen::verifier; @@ -75,9 +76,13 @@ fn handle_module(path: &Path, flags: &Flags) { }; let mut dummy_environ = DummyEnvironment::with_triple_flags(triple!("riscv64"), flags.clone()); translate_module(&data, &mut dummy_environ).unwrap(); + + let isa = isa::lookup(dummy_environ.info.triple) + .unwrap() + .finish(dummy_environ.info.flags); for func in dummy_environ.info.function_bodies.values() { - verifier::verify_function(func, flags) - .map_err(|errors| panic!(pretty_verifier_error(func, None, None, errors))) + verifier::verify_function(func, &*isa) + .map_err(|errors| panic!(pretty_verifier_error(func, Some(&*isa), None, errors))) .unwrap(); } }