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

Initialize function names and signatures before calling translate_from_reader.

Browse Source
This commit is contained in:
Dan Gohman
2017-10-13 16:42:40 -07:00
parent b87178647b
commit 233d2cd773
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/runtime/src/lib.rs
View File

@@ -508,18 +508,17 @@ impl<'data, 'module> ModuleTranslation<'data, 'module> {
) -> Result<(Compilation<'module>, Relocations), String> { ) -> Result<(Compilation<'module>, Relocations), String> {
let mut functions = Vec::new(); let mut functions = Vec::new();
let mut relocations = Vec::new(); let mut relocations = Vec::new();
for input in &self.lazy.function_body_inputs { for (func_index, input) in self.lazy.function_body_inputs.iter().enumerate() {
let mut trans = FuncTranslator::new();
let mut context = cretonne::Context::new(); let mut context = cretonne::Context::new();
context.func.name = get_func_name(func_index);
context.func.signature = self.module.signatures[self.module.functions[func_index]]
.clone();
let mut trans = FuncTranslator::new();
let reader = wasmparser::BinaryReader::new(input); let reader = wasmparser::BinaryReader::new(input);
trans
{ .translate_from_reader(reader, &mut context.func, &mut self.func_env())
let mut func_environ = self.func_env(); .map_err(|e| String::from(e.description()))?;
trans
.translate_from_reader(reader, &mut context.func, &mut func_environ)
.map_err(|e| String::from(e.description()))?;
}
let code_size = context.compile(isa).map_err( let code_size = context.compile(isa).map_err(
|e| String::from(e.description()), |e| String::from(e.description()),