Skip to content

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

Fix `LastStores::update` for stores without an alias region (#13512)

Nick Fitzgeraldf273e5138321
diff --git a/cranelift/codegen/src/alias_analysis.rs b/cranelift/codegen/src/alias_analysis.rs
index dbfd958361..bc31ed2b84 100644
--- a/cranelift/codegen/src/alias_analysis.rs
+++ b/cranelift/codegen/src/alias_analysis.rs
@@ -98,7 +98,12 @@ impl LastStores {
match func.dfg.mem_flags[memflags].alias_region() {
Some(region) => self.regions[region] = inst.into(),
None => {
+ // A store with no alias region may alias any region, so
+ // treat it like a fence: clear all regions and update
+ // `last_fence` so that subsequent region-tagged loads don't
+ // forward stale values past this store.
self.regions.clear();
+ self.last_fence = inst.into();
self.other = inst.into();
}
}
diff --git a/cranelift/filetests/filetests/alias/issue-13508.clif b/cranelift/filetests/filetests/alias/issue-13508.clif
new file mode 100644
index 0000000000..2c86a63ef4
--- /dev/null
+++ b/cranelift/filetests/filetests/alias/issue-13508.clif
@@ -0,0 +1,51 @@
+test interpret
+test run
+test alias-analysis
+
+set opt_level=speed
+
+target aarch64
+
+function %f(i64, i64, i64) -> i32, i32, i32 {
+ region0 = 2 "vmctx"
+
+block0(v0: i64, v1: i64, v2: i64):
+ ;; Initialize to `-1`.
+ v3 = iconst.i64 -1
+ store notrap v3, v0
+
+ ;; Memory fence nop.
+ v4 = atomic_cas v2, v0, v0
+
+ ;; Load with region (fills cache v5+4 -> v4).
+ v5 = load.i32 region0 v0
+ ; check: v5 = load.i32 region0 v0
+
+ ;; Load with region again (gets cached v4).
+ v6 = load.i32 region0 v0
+ ; check: v6 -> v5
+
+ ;; Store without region (clobbers cache).
+ v7 = iconst.i32 42
+ store notrap v7, v1
+
+ ;; Load with region (shouldn't get cached v4).
+ v8 = load.i32 region0 v0
+ ; check: v8 = load.i32 region0 v0
+
+ return v5, v6, v8
+}
+
+function %g() -> i32, i32, i32 {
+ ss0 = explicit_slot 8
+ ss1 = explicit_slot 8
+ fn0 = %f(i64, i64, i64) -> i32, i32, i32
+
+block0:
+ v0 = stack_addr.i64 ss0
+ v1 = stack_addr.i64 ss1
+ v2, v3, v4 = call fn0(v0, v0, v1)
+ return v2, v3, v4
+}
+
+; run: %g() == [-1, -1, 42]