mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-09-03 07:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sometimes we generate our own function names. Look up names in our name map, not the wasm module.

Browse Source
This commit is contained in:
Nick Lewycky
2020-05-13 11:50:23 -07:00
parent 26cea55e84
commit 119320603c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/compiler-llvm/src/translator/code.rs
View File

@ -207,6 +207,7 @@ impl FuncTranslator {
// TODO: pointer width // TODO: pointer width
vmoffsets: VMOffsets::new(8, &wasm_module), vmoffsets: VMOffsets::new(8, &wasm_module),
wasm_module, wasm_module,
func_names,
}; };
while fcg.state.has_control_frames() { while fcg.state.has_control_frames() {
@ -1409,6 +1410,7 @@ pub struct LLVMFunctionCodeGenerator<'ctx, 'a> {
module: &'a Module<'ctx>, module: &'a Module<'ctx>,
vmoffsets: VMOffsets, vmoffsets: VMOffsets,
wasm_module: &'a WasmerCompilerModule, wasm_module: &'a WasmerCompilerModule,
func_names: &'a SecondaryMap<FunctionIndex, String>,
} }
impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> { impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
@ -2270,7 +2272,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
let func_index = FunctionIndex::from_u32(function_index); let func_index = FunctionIndex::from_u32(function_index);
let sigindex = &module.functions[func_index]; let sigindex = &module.functions[func_index];
let func_type = &module.signatures[*sigindex]; let func_type = &module.signatures[*sigindex];
let func_name = &module.func_names[&func_index]; let func_name = &self.func_names[func_index];
let llvm_func_type = func_type_to_llvm(&self.context, &intrinsics, func_type); let llvm_func_type = func_type_to_llvm(&self.context, &intrinsics, func_type);
let func = self.module.get_function(func_name); let func = self.module.get_function(func_name);