Skip to content

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

cranelift: Print memory flags on atomic_rmw and atomic_cas (#14621)

Sashad162e276748
diff --git a/cranelift/codegen/src/write.rs b/cranelift/codegen/src/write.rs
index 5f5584209c..6dbe790d37 100644
--- a/cranelift/codegen/src/write.rs
+++ b/cranelift/codegen/src/write.rs
@@ -394,8 +394,18 @@ pub fn write_operands(w: &mut dyn Write, dfg: &DataFlowGraph, inst: Inst) -> fmt
use crate::ir::instructions::InstructionData::*;
let ctrl_ty = dfg.ctrl_typevar(inst);
match dfg.insts[inst] {
- AtomicRmw { op, args, .. } => write!(w, " {} {}, {}", op, args[0], args[1]),
- AtomicCas { args, .. } => write!(w, " {}, {}, {}", args[0], args[1], args[2]),
+ AtomicRmw {
+ op, args, flags, ..
+ } => write!(
+ w,
+ "{} {} {}, {}",
+ dfg.mem_flags[flags], op, args[0], args[1]
+ ),
+ AtomicCas { args, flags, .. } => write!(
+ w,
+ "{} {}, {}, {}",
+ dfg.mem_flags[flags], args[0], args[1], args[2]
+ ),
LoadNoOffset { flags, arg, .. } => write!(w, "{} {arg}", dfg.mem_flags[flags]),
StoreNoOffset { flags, args, .. } => {
write!(w, "{} {}, {}", dfg.mem_flags[flags], args[0], args[1])
diff --git a/cranelift/filetests/filetests/parser/atomic-memflags.clif b/cranelift/filetests/filetests/parser/atomic-memflags.clif
new file mode 100644
index 0000000000..b909d9a673
--- /dev/null
+++ b/cranelift/filetests/filetests/parser/atomic-memflags.clif
@@ -0,0 +1,13 @@
+test cat
+
+function %atomic_memflags(i32) -> i32, i32 {
+ ss0 = explicit_slot 4
+
+block0(v1: i32):
+ v0 = stack_addr.i64 ss0
+ v2 = atomic_rmw.i32 big add v0, v1
+ v3 = atomic_cas.i32 little v0, v1, v2
+ return v2, v3
+}
+; check: v2 = atomic_rmw.i32 big add v0, v1
+; check: v3 = atomic_cas little v0, v1, v2