Skip to content

A lightweight WebAssembly runtime that is fast, secure, and standards-compliant

Fix vmctx used in component traps (#12642)

Alex Crichtonbc6d3f80a6e3
diff --git a/crates/cranelift/src/compiler/component.rs b/crates/cranelift/src/compiler/component.rs
index deb8113472..bba19ea5bf 100644
--- a/crates/cranelift/src/compiler/component.rs
+++ b/crates/cranelift/src/compiler/component.rs
@@ -1551,7 +1551,7 @@ impl<'a> TrampolineCompiler<'a> {
(
TrapTranslator {
compiler: self.compiler,
- vmctx: self.builder.func.dfg.block_params(self.block0)[0],
+ vmctx: self.caller_vmctx(),
builtins: &mut self.builtins,
},
&mut self.builder,
diff --git a/tests/disas/component-may-leave-without-signals-based-traps.wat b/tests/disas/component-may-leave-without-signals-based-traps.wat
index 7b01bbd303..fe2921d68a 100644
--- a/tests/disas/component-may-leave-without-signals-based-traps.wat
+++ b/tests/disas/component-may-leave-without-signals-based-traps.wat
@@ -45,11 +45,11 @@
;; 129: movq %rbx, %rsi
;; 12c: movq 0x10(%rsi), %rax
;; 130: movq 0x198(%rax), %rax
-;; 137: movq %rsi, %rdi
+;; 137: movq %rbx, %rdi
;; 13a: callq *%rax
;; 13c: ud2
-;; 13e: movq %rdi, %rbx
-;; 141: movl $0x17, %esi
+;; 13e: movl $0x17, %esi
+;; 143: movq %rbx, %rdi
;; 146: callq 0x6a
;; 14b: movq %rbx, %rdi
;; 14e: callq 0x9b