T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the type of table bounds in DummyEnvironment.

Browse Source 
Also, fix the wasm testsuite harness to run the verifier with a
TargetIsa so that it catches problems like this.
This commit is contained in:
Dan Gohman
2018-09-12 14:38:15 -07:00
parent 52e6b07058
commit d0f703a6ff
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/wasm/src/environ/dummy.rs
View File

@@ -206,7 +206,7 @@ impl<'dummy_environment> FuncEnvironment for DummyFuncEnvironment<'dummy_environ
let bound_gv = func.create_global_value(ir::GlobalValueData::Load { let bound_gv = func.create_global_value(ir::GlobalValueData::Load {
base: vmctx, base: vmctx,
offset: Offset32::new(0), offset: Offset32::new(0),
global_type: self.pointer_type(), global_type: I32,
}); });
func.create_table(ir::TableData { func.create_table(ir::TableData {

9
lib/wasm/tests/wasm_testsuite.rs
View File

@@ -4,6 +4,7 @@ extern crate cranelift_wasm;
extern crate target_lexicon; extern crate target_lexicon;
extern crate wabt; extern crate wabt;
use cranelift_codegen::isa;
use cranelift_codegen::print_errors::pretty_verifier_error; use cranelift_codegen::print_errors::pretty_verifier_error;
use cranelift_codegen::settings::{self, Configurable, Flags}; use cranelift_codegen::settings::{self, Configurable, Flags};
use cranelift_codegen::verifier; 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()); let mut dummy_environ = DummyEnvironment::with_triple_flags(triple!("riscv64"), flags.clone());
translate_module(&data, &mut dummy_environ).unwrap(); 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() { for func in dummy_environ.info.function_bodies.values() {
verifier::verify_function(func, flags) verifier::verify_function(func, &*isa)
.map_err(|errors| panic!(pretty_verifier_error(func, None, None, errors))) .map_err(|errors| panic!(pretty_verifier_error(func, Some(&*isa), None, errors)))
.unwrap(); .unwrap();
} }
} }