Skip to content

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

Add missing missing stack map declaration for `array.new_data` (#12935)

Nick Fitzgerald0d66dffd619e
diff --git a/crates/cranelift/src/func_environ.rs b/crates/cranelift/src/func_environ.rs
index e6b27c8a3a..eefe43f6d2 100644
--- a/crates/cranelift/src/func_environ.rs
+++ b/crates/cranelift/src/func_environ.rs
@@ -2742,7 +2742,9 @@ impl FuncEnvironment<'_> {
libcall,
&[vmctx, interned_type_index, data_index, data_offset, len],
);
- Ok(builder.func.dfg.first_result(call_inst))
+ let array_ref = builder.func.dfg.first_result(call_inst);
+ builder.declare_value_needs_stack_map(array_ref);
+ Ok(array_ref)
}
pub fn translate_array_new_elem(
diff --git a/tests/misc_testsuite/gc/array-new-data-missing-stack-map.wast b/tests/misc_testsuite/gc/array-new-data-missing-stack-map.wast
new file mode 100644
index 0000000000..d9213dc14d
--- /dev/null
+++ b/tests/misc_testsuite/gc/array-new-data-missing-stack-map.wast
@@ -0,0 +1,20 @@
+;;! gc = true
+;;! bulk_memory = true
+
+(module
+ (type $arr (array i8))
+ (data $d "hello world")
+
+ (import "wasmtime" "gc" (func $gc))
+
+ (func (export "test") (result i32)
+ (array.new_data $arr $d (i32.const 0) (i32.const 5))
+
+ (call $gc)
+ (drop (array.new $arr (i32.const 0) (i32.const 5)))
+
+ (array.get_u $arr (i32.const 0))
+ )
+)
+
+(assert_return (invoke "test") (i32.const 104)) ;; 'h'