wazevo: fixes FunctionDefinition index for listeners

Signed-off-by: Takeshi Yoneda <[email protected]>
tetratelabs · Mar 6, 2024 · 8cd5507 · 8cd5507
1 parent d89236b
commit 8cd5507
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/experimental/listener_test.go b/experimental/listener_test.go
@@ -8,6 +8,7 @@ import (
 	"github.com/tetratelabs/wazero"
 	"github.com/tetratelabs/wazero/api"
 	"github.com/tetratelabs/wazero/experimental"
+	"github.com/tetratelabs/wazero/experimental/opt"
 	"github.com/tetratelabs/wazero/experimental/wazerotest"
 	"github.com/tetratelabs/wazero/internal/testing/binaryencoding"
 	"github.com/tetratelabs/wazero/internal/testing/require"
@@ -73,7 +74,7 @@ func TestFunctionListenerFactory(t *testing.T) {
 		},
 	})
 
-	r := wazero.NewRuntime(ctx)
+	r := wazero.NewRuntimeWithConfig(ctx, opt.NewRuntimeConfigOptimizingCompiler())
 	defer r.Close(ctx) // This closes everything this Runtime created.
 
 	_, err := r.NewHostModuleBuilder("host").NewFunctionBuilder().WithFunc(func() {}).Export("").Instantiate(ctx)

diff --git a/internal/engine/wazevo/call_engine.go b/internal/engine/wazevo/call_engine.go
@@ -359,7 +359,7 @@ func (c *callEngine) callWithStack(ctx context.Context, paramResultStack []uint6
 			index := wasm.Index(stack[0])
 			mod := c.callerModuleInstance()
 			listener := mod.Engine.(*moduleEngine).listeners[index]
-			def := mod.Source.FunctionDefinition(index)
+			def := mod.Source.FunctionDefinition(index + mod.Source.ImportFunctionCount)
 			listener.Before(ctx, mod, def, stack[1:], c.stackIterator(false))
 			c.execCtx.exitCode = wazevoapi.ExitCodeOK
 			afterGoFunctionCallEntrypoint(c.execCtx.goCallReturnAddress, c.execCtxPtr,
@@ -369,7 +369,7 @@ func (c *callEngine) callWithStack(ctx context.Context, paramResultStack []uint6
 			index := wasm.Index(stack[0])
 			mod := c.callerModuleInstance()
 			listener := mod.Engine.(*moduleEngine).listeners[index]
-			def := mod.Source.FunctionDefinition(index)
+			def := mod.Source.FunctionDefinition(index + mod.Source.ImportFunctionCount)
 			listener.After(ctx, mod, def, stack[1:])
 			c.execCtx.exitCode = wazevoapi.ExitCodeOK
 			afterGoFunctionCallEntrypoint(c.execCtx.goCallReturnAddress, c.execCtxPtr,