Merge #325

325: change func_index offset by number of imported funcs r=syrusakbary a=MarkMcCaskey This appears to fix the issue of the debug statements reporting the wrong function index Co-authored-by: Mark McCaskey <[email protected]>
wasmerio · Apr 4, 2019 · e03a4a2 · e03a4a2
2 parents 1ac689c + 9e601c4
commit e03a4a2
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/clif-backend/src/module_env.rs b/lib/clif-backend/src/module_env.rs
@@ -530,7 +530,10 @@ impl<'module, 'isa, 'data> ModuleEnvironment<'data> for ModuleEnv<'module, 'isa>
                     .special_param(ir::ArgumentPurpose::VMContext)
                     .expect("missing vmctx parameter");
 
-                let func_index = pos.ins().iconst(ir::types::I32, func_index.index() as i64);
+                let func_index = pos.ins().iconst(
+                    ir::types::I32,
+                    func_index.index() as i64 + self.module.info.imported_functions.len() as i64,
+                );
 
                 pos.ins().call(start_debug, &[vmctx, func_index]);