Skip to content

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

Cranelift: preserve source locations during egraph elaboration (#15184)

Lancelot de Ferrièrea691c346b4de
diff --git a/cranelift/codegen/src/egraph/elaborate.rs b/cranelift/codegen/src/egraph/elaborate.rs
index 8133206634..c8907b2fd7 100644
--- a/cranelift/codegen/src/egraph/elaborate.rs
+++ b/cranelift/codegen/src/egraph/elaborate.rs
@@ -494,6 +494,10 @@ impl<'a> Elaborator<'a> {
let inst = func.dfg.value_def(arg.value).inst().unwrap();
debug_assert_eq!(func.dfg.inst_results(inst).len(), 1);
let new_inst = func.dfg.clone_inst(inst);
+ let srcloc = func.srclocs[inst];
+ if !srcloc.is_default() {
+ func.srclocs[new_inst] = srcloc;
+ }
func.layout.insert_inst(new_inst, before);
let new_result = func.dfg.inst_results(new_inst)[0];
*v.insert(new_result)
@@ -721,6 +725,10 @@ impl<'a> Elaborator<'a> {
let inst = if self.func.layout.inst_block(inst).is_some() || remat_arg {
// Clone the inst!
let new_inst = self.func.dfg.clone_inst(inst);
+ let srcloc = self.func.srclocs[inst];
+ if !srcloc.is_default() {
+ self.func.srclocs[new_inst] = srcloc;
+ }
trace!(
" -> inst {} already has a location; cloned to {}",
inst, new_inst
diff --git a/cranelift/filetests/filetests/egraph/source-locations.clif b/cranelift/filetests/filetests/egraph/source-locations.clif
new file mode 100644
index 0000000000..acd927f0f6
--- /dev/null
+++ b/cranelift/filetests/filetests/egraph/source-locations.clif
@@ -0,0 +1,30 @@
+test optimize
+set opt_level=speed
+target x86_64
+
+;; Hoisted constants are rematerialized in their use blocks, and their users
+;; are cloned when the arguments change. Both must retain their source locations.
+function %source_locations(i32, i32) -> i32 {
+block0(v0: i32, v1: i32):
+ jump block1(v0)
+
+block1(v2: i32):
+@0010 v3 = iconst.i32 1
+@0020 v4 = iadd.i32 v1, v3
+@0030 v5 = iconst.i32 40
+@0040 v6 = icmp eq v2, v5
+@0050 v8 = iadd.i32 v2, v3
+ brif v6, block2(v4), block1(v8)
+
+block2(v9: i32):
+ return v9
+}
+
+; check: block1(v2: i32):
+; check: @0030 v10 = iconst.i32 40
+; check: @0040 v11 = icmp eq v2, v10
+; check: @0010 v12 = iconst.i32 1
+; check: @0050 v13 = iadd v2, v12
+; check: block2:
+; check: @0010 v14 = iconst.i32 1
+; check: @0020 v15 = iadd.i32 v1, v14
diff --git a/tests/disas/array-copy-anyref.wat b/tests/disas/array-copy-anyref.wat
index becaa19855..f8a2fef4b1 100644
--- a/tests/disas/array-copy-anyref.wat
+++ b/tests/disas/array-copy-anyref.wat
@@ -77,23 +77,23 @@
;; block3(v83: i64, v84: i64, v85: i32):
;; @002b v88 = load.i32 user2 little region5 v84
;; @002b store user2 little region5 v88, v83
-;; v123 = iconst.i64 4
-;; v124 = iadd v84, v123 ; v123 = 4
+;; @002b v123 = iconst.i64 4
+;; @002b v124 = iadd v84, v123 ; v123 = 4
;; @002b v95 = icmp eq v124, v80
-;; v125 = iadd v83, v123 ; v123 = 4
-;; v126 = iconst.i32 1
-;; v127 = iadd v85, v126 ; v126 = 1
+;; @002b v125 = iadd v83, v123 ; v123 = 4
+;; @002b v126 = iconst.i32 1
+;; @002b v127 = iadd v85, v126 ; v126 = 1
;; @002b brif v95, block5, block3(v125, v124, v127)
;;
;; block4(v96: i64, v97: i64, v98: i32):
-;; v118 = iconst.i64 4
-;; v119 = isub v97, v118 ; v118 = 4
+;; @002b v118 = iconst.i64 4
+;; @002b v119 = isub v97, v118 ; v118 = 4
;; @002b v107 = load.i32 user2 little region5 v119
-;; v120 = isub v96, v118 ; v118 = 4
+;; @002b v120 = isub v96, v118 ; v118 = 4
;; @002b store user2 little region5 v107, v120
;; @002b v108 = icmp eq v119, v54
-;; v121 = iconst.i32 1
-;; v122 = isub v98, v121 ; v121 = 1
+;; @002b v121 = iconst.i32 1
+;; @002b v122 = isub v98, v121 ; v121 = 1
;; @002b brif v108, block5, block4(v120, v119, v122)
;;
;; block5:
diff --git a/tests/disas/array-fill-anyref.wat b/tests/disas/array-fill-anyref.wat
index b6983ba192..5f9713cf89 100644
--- a/tests/disas/array-fill-anyref.wat
+++ b/tests/disas/array-fill-anyref.wat
@@ -63,8 +63,8 @@
;;
;; block2(v43: i64):
;; @0030 store.i32 user2 little region5 v4, v43
-;; v57 = iconst.i64 4
-;; v58 = iadd v43, v57 ; v57 = 4
+;; @0030 v57 = iconst.i64 4
+;; @0030 v58 = iadd v43, v57 ; v57 = 4
;; @0030 v46 = icmp eq v58, v40
;; @0030 brif v46, block3, block2(v58)
;;
@@ -120,10 +120,10 @@
;; @003e brif v54, block3, block2(v29)
;;
;; block2(v43: i64):
-;; v56 = iconst.i32 0
+;; @003a v56 = iconst.i32 0
;; @003e store user2 little region5 v56, v43 ; v56 = 0
-;; v57 = iconst.i64 4
-;; v58 = iadd v43, v57 ; v57 = 4
+;; @003e v57 = iconst.i64 4
+;; @003e v58 = iadd v43, v57 ; v57 = 4
;; @003e v46 = icmp eq v58, v40
;; @003e brif v46, block3, block2(v58)
;;
@@ -180,10 +180,10 @@
;; @004e brif v65, block3, block2(v33)
;;
;; block2(v47: i64):
-;; v67 = iconst.i32 -1
+;; @0048 v67 = iconst.i32 -1
;; @004e store user2 little region5 v67, v47 ; v67 = -1
-;; v68 = iconst.i64 4
-;; v69 = iadd v47, v68 ; v68 = 4
+;; @004e v68 = iconst.i64 4
+;; @004e v69 = iadd v47, v68 ; v68 = 4
;; @004e v50 = icmp eq v69, v44
;; @004e brif v50, block3, block2(v69)
;;
diff --git a/tests/disas/array-fill-externref.wat b/tests/disas/array-fill-externref.wat
index f3b54a55c1..ce74f03efe 100644
--- a/tests/disas/array-fill-externref.wat
+++ b/tests/disas/array-fill-externref.wat
@@ -59,8 +59,8 @@
;;
;; block2(v43: i64):
;; @002f store.i32 user2 little region5 v4, v43
-;; v57 = iconst.i64 4
-;; v58 = iadd v43, v57 ; v57 = 4
+;; @002f v57 = iconst.i64 4
+;; @002f v58 = iadd v43, v57 ; v57 = 4
;; @002f v46 = icmp eq v58, v40
;; @002f brif v46, block3, block2(v58)
;;
@@ -116,10 +116,10 @@
;; @003d brif v54, block3, block2(v29)
;;
;; block2(v43: i64):
-;; v56 = iconst.i32 0
+;; @0039 v56 = iconst.i32 0
;; @003d store user2 little region5 v56, v43 ; v56 = 0
-;; v57 = iconst.i64 4
-;; v58 = iadd v43, v57 ; v57 = 4
+;; @003d v57 = iconst.i64 4
+;; @003d v58 = iadd v43, v57 ; v57 = 4
;; @003d v46 = icmp eq v58, v40
;; @003d brif v46, block3, block2(v58)
;;
diff --git a/tests/disas/array-fill-f32.wat b/tests/disas/array-fill-f32.wat
index 50992967ee..7c6f1fd484 100644
--- a/tests/disas/array-fill-f32.wat
+++ b/tests/disas/array-fill-f32.wat
@@ -63,8 +63,8 @@
;;
;; block2(v43: i64):
;; @0030 store.f32 user2 little region5 v4, v43
-;; v57 = iconst.i64 4
-;; v58 = iadd v43, v57 ; v57 = 4
+;; @0030 v57 = iconst.i64 4
+;; @0030 v58 = iadd v43, v57 ; v57 = 4
;; @0030 v46 = icmp eq v58, v40
;; @0030 brif v46, block3, block2(v58)
;;
@@ -168,10 +168,10 @@
;; @0052 brif v55, block3, block2(v29)
;;
;; block2(v43: i64):
-;; v57 = f32const 0x1.000000p0
+;; @004b v57 = f32const 0x1.000000p0
;; @0052 store user2 little region5 v57, v43 ; v57 = 0x1.000000p0
-;; v58 = iconst.i64 4
-;; v59 = iadd v43, v58 ; v58 = 4
+;; @0052 v58 = iconst.i64 4
+;; @0052 v59 = iadd v43, v58 ; v58 = 4
;; @0052 v46 = icmp eq v59, v40
;; @0052 brif v46, block3, block2(v59)
;;
diff --git a/tests/disas/array-fill-f64.wat b/tests/disas/array-fill-f64.wat
index ecd568fd6d..abb580b1b9 100644
--- a/tests/disas/array-fill-f64.wat
+++ b/tests/disas/array-fill-f64.wat
@@ -63,8 +63,8 @@
;;
;; block2(v43: i64):
;; @0030 store.f64 user2 little region5 v4, v43
-;; v57 = iconst.i64 8
-;; v58 = iadd v43, v57 ; v57 = 8
+;; @0030 v57 = iconst.i64 8
+;; @0030 v58 = iadd v43, v57 ; v57 = 8
;; @0030 v46 = icmp eq v58, v40
;; @0030 brif v46, block3, block2(v58)
;;
@@ -168,10 +168,10 @@
;; @005a brif v55, block3, block2(v29)
;;
;; block2(v43: i64):
-;; v57 = f64const 0x1.0000000000000p0
+;; @004f v57 = f64const 0x1.0000000000000p0
;; @005a store user2 little region5 v57, v43 ; v57 = 0x1.0000000000000p0
-;; v58 = iconst.i64 8
-;; v59 = iadd v43, v58 ; v58 = 8
+;; @005a v58 = iconst.i64 8
+;; @005a v59 = iadd v43, v58 ; v58 = 8
;; @005a v46 = icmp eq v59, v40
;; @005a brif v46, block3, block2(v59)
;;
diff --git a/tests/disas/array-fill-funcref.wat b/tests/disas/array-fill-funcref.wat
index ac977ca605..c4f43867a1 100644
--- a/tests/disas/array-fill-funcref.wat
+++ b/tests/disas/array-fill-funcref.wat
@@ -70,8 +70,8 @@
;;
;; block2(v45: i64):
;; @003b store.i32 notrap aligned little region5 v41, v45
-;; v59 = iconst.i64 4
-;; v60 = iadd v45, v59 ; v59 = 4
+;; @003b v59 = iconst.i64 4
+;; @003b v60 = iadd v45, v59 ; v59 = 4
;; @003b v48 = icmp eq v60, v42
;; @003b brif v48, block3, block2(v60)
;;
@@ -133,8 +133,8 @@
;;
;; block2(v45: i64):
;; @0049 store.i32 notrap aligned little region5 v41, v45
-;; v58 = iconst.i64 4
-;; v59 = iadd v45, v58 ; v58 = 4
+;; @0049 v58 = iconst.i64 4
+;; @0049 v59 = iadd v45, v58 ; v58 = 4
;; @0049 v48 = icmp eq v59, v42
;; @0049 brif v48, block3, block2(v59)
;;
@@ -214,8 +214,8 @@
;;
;; block2(v50: i64):
;; @0057 store.i32 notrap aligned little region10 v46, v50
-;; v64 = iconst.i64 4
-;; v65 = iadd v50, v64 ; v64 = 4
+;; @0057 v64 = iconst.i64 4
+;; @0057 v65 = iadd v50, v64 ; v64 = 4
;; @0057 v53 = icmp eq v65, v47
;; @0057 brif v53, block3, block2(v65)
;;
diff --git a/tests/disas/array-fill-i16.wat b/tests/disas/array-fill-i16.wat
index d8a7f4e6e4..82f6a6599a 100644
--- a/tests/disas/array-fill-i16.wat
+++ b/tests/disas/array-fill-i16.wat
@@ -67,8 +67,8 @@
;;
;; block2(v43: i64):
;; @0031 istore16.i32 user2 little region5 v4, v43
-;; v60 = iconst.i64 2
-;; v61 = iadd v43, v60 ; v60 = 2
+;; @0031 v60 = iconst.i64 2
+;; @0031 v61 = iadd v43, v60 ; v60 = 2
;; @0031 v46 = icmp eq v61, v40
;; @0031 brif v46, block3, block2(v61)
;;
@@ -219,10 +219,10 @@
;; @005d brif v58, block3, block2(v29)
;;
;; block2(v43: i64):
-;; v60 = iconst.i32 0xdead
+;; @0057 v60 = iconst.i32 0xdead
;; @005d istore16 user2 little region5 v60, v43 ; v60 = 0xdead
-;; v61 = iconst.i64 2
-;; v62 = iadd v43, v61 ; v61 = 2
+;; @005d v61 = iconst.i64 2
+;; @005d v62 = iadd v43, v61 ; v61 = 2
;; @005d v46 = icmp eq v62, v40
;; @005d brif v46, block3, block2(v62)
;;
diff --git a/tests/disas/array-fill-i31ref.wat b/tests/disas/array-fill-i31ref.wat
index e19e1dd400..782afa966b 100644
--- a/tests/disas/array-fill-i31ref.wat
+++ b/tests/disas/array-fill-i31ref.wat
@@ -63,8 +63,8 @@
;;
;; block2(v43: i64):
;; @0030 store.i32 user2 little region5 v4, v43
-;; v57 = iconst.i64 4
-;; v58 = iadd v43, v57 ; v57 = 4
+;; @0030 v57 = iconst.i64 4
+;; @0030 v58 = iadd v43, v57 ; v57 = 4
;; @0030 v46 = icmp eq v58, v40
;; @0030 brif v46, block3, block2(v58)
;;
@@ -120,10 +120,10 @@
;; @003e brif v54, block3, block2(v29)
;;
;; block2(v43: i64):
-;; v56 = iconst.i32 0
+;; @003a v56 = iconst.i32 0
;; @003e store user2 little region5 v56, v43 ; v56 = 0
-;; v57 = iconst.i64 4
-;; v58 = iadd v43, v57 ; v57 = 4
+;; @003e v57 = iconst.i64 4
+;; @003e v58 = iadd v43, v57 ; v57 = 4
;; @003e v46 = icmp eq v58, v40
;; @003e brif v46, block3, block2(v58)
;;
@@ -180,10 +180,10 @@
;; @004e brif v65, block3, block2(v33)
;;
;; block2(v47: i64):
-;; v67 = iconst.i32 -1
+;; @0048 v67 = iconst.i32 -1
;; @004e store user2 little region5 v67, v47 ; v67 = -1
-;; v68 = iconst.i64 4
-;; v69 = iadd v47, v68 ; v68 = 4
+;; @004e v68 = iconst.i64 4
+;; @004e v69 = iadd v47, v68 ; v68 = 4
;; @004e v50 = icmp eq v69, v44
;; @004e brif v50, block3, block2(v69)
;;
diff --git a/tests/disas/array-fill-i32.wat b/tests/disas/array-fill-i32.wat
index a04b8e798d..c886495d5b 100644
--- a/tests/disas/array-fill-i32.wat
+++ b/tests/disas/array-fill-i32.wat
@@ -67,8 +67,8 @@
;;
;; block2(v43: i64):
;; @0031 store.i32 user2 little region5 v4, v43
-;; v57 = iconst.i64 4
-;; v58 = iadd v43, v57 ; v57 = 4
+;; @0031 v57 = iconst.i64 4
+;; @0031 v58 = iadd v43, v57 ; v57 = 4
;; @0031 v46 = icmp eq v58, v40
;; @0031 brif v46, block3, block2(v58)
;;
@@ -219,10 +219,10 @@
;; @005d brif v55, block3, block2(v29)
;;
;; block2(v43: i64):
-;; v57 = iconst.i32 0xdead
+;; @0057 v57 = iconst.i32 0xdead
;; @005d store user2 little region5 v57, v43 ; v57 = 0xdead
-;; v58 = iconst.i64 4
-;; v59 = iadd v43, v58 ; v58 = 4
+;; @005d v58 = iconst.i64 4
+;; @005d v59 = iadd v43, v58 ; v58 = 4
;; @005d v46 = icmp eq v59, v40
;; @005d brif v46, block3, block2(v59)
;;
diff --git a/tests/disas/array-fill-i64.wat b/tests/disas/array-fill-i64.wat
index b065ee05d1..e5670d0236 100644
--- a/tests/disas/array-fill-i64.wat
+++ b/tests/disas/array-fill-i64.wat
@@ -67,8 +67,8 @@
;;
;; block2(v43: i64):
;; @0031 store.i64 user2 little region5 v4, v43
-;; v57 = iconst.i64 8
-;; v58 = iadd v43, v57 ; v57 = 8
+;; @0031 v57 = iconst.i64 8
+;; @0031 v58 = iadd v43, v57 ; v57 = 8
;; @0031 v46 = icmp eq v58, v40
;; @0031 brif v46, block3, block2(v58)
;;
@@ -219,10 +219,10 @@
;; @005b brif v55, block3, block2(v29)
;;
;; block2(v43: i64):
-;; v57 = iconst.i64 1
+;; @0057 v57 = iconst.i64 1
;; @005b store user2 little region5 v57, v43 ; v57 = 1
-;; v58 = iconst.i64 8
-;; v59 = iadd v43, v58 ; v58 = 8
+;; @005b v58 = iconst.i64 8
+;; @005b v59 = iadd v43, v58 ; v58 = 8
;; @005b v46 = icmp eq v59, v40
;; @005b brif v46, block3, block2(v59)
;;
diff --git a/tests/disas/component-model/compile-time-builtins.wat b/tests/disas/component-model/compile-time-builtins.wat
index 4ed2df18eb..95b243622e 100644
--- a/tests/disas/component-model/compile-time-builtins.wat
+++ b/tests/disas/component-model/compile-time-builtins.wat
@@ -471,7 +471,7 @@
;; jump block71
;;
;; block71:
-;; v134 = iconst.i64 1
-;; v135 = iadd.i64 v6, v134 ; v134 = 1
+;; @0595 v134 = iconst.i64 1
+;; @0597 v135 = iadd.i64 v6, v134 ; v134 = 1
;; @059a jump block2(v135)
;; }
diff --git a/tests/disas/component-model/known-imported-adapter-memory.wat b/tests/disas/component-model/known-imported-adapter-memory.wat
index 60b2c0387d..6d3ead81b3 100644
--- a/tests/disas/component-model/known-imported-adapter-memory.wat
+++ b/tests/disas/component-model/known-imported-adapter-memory.wat
@@ -213,22 +213,22 @@
;; @0139 trap user4
;;
;; block12:
-;; v80 = iconst.i32 3
-;; v81 = band.i32 v3, v80 ; v80 = 3
+;; @011b v80 = iconst.i32 3
+;; @0141 v81 = band.i32 v3, v80 ; v80 = 3
;; @0142 trapnz v81, user36
;; @0142 jump block16
;;
;; block16:
;; @014c v40 = load.i64 notrap aligned readonly can_move region6 v0+72
;; @014c v41 = load.i64 notrap aligned region8 v40+8
-;; v82 = iconst.i64 16
-;; v83 = ushr v41, v82 ; v82 = 16
+;; @0128 v82 = iconst.i64 16
+;; @014c v83 = ushr v41, v82 ; v82 = 16
;; @014c v44 = ireduce.i32 v83
;; @014e v45 = uextend.i64 v44
-;; v84 = ishl v45, v82 ; v82 = 16
+;; @0151 v84 = ishl v45, v82 ; v82 = 16
;; @0154 v48 = uextend.i64 v3
;; v85 = iconst.i64 8
-;; v86 = iadd v48, v85 ; v85 = 8
+;; @0158 v86 = iadd v48, v85 ; v85 = 8
;; @0159 v52 = icmp uge v84, v86
;; @015a brif v52, block17, block19
;;
diff --git a/tests/disas/component-model/known-imported-entities.wat b/tests/disas/component-model/known-imported-entities.wat
index 44c37ac18a..6b9c6afc5d 100644
--- a/tests/disas/component-model/known-imported-entities.wat
+++ b/tests/disas/component-model/known-imported-entities.wat
@@ -107,7 +107,7 @@
;; @0080 brif v13, block3(v15), block2
;;
;; block2 cold:
-;; v25 = iconst.i32 0
+;; @007e v25 = iconst.i32 0
;; v26 = iconst.i64 0
;; @0080 v19 = call fn0(v0, v25, v26) ; v25 = 0, v26 = 0
;; @0080 jump block3(v19)
@@ -189,7 +189,7 @@
;; @0102 brif v15, block3(v17), block2
;;
;; block2 cold:
-;; v27 = iconst.i32 0
+;; @0100 v27 = iconst.i32 0
;; v28 = iconst.i64 0
;; @0102 v21 = call fn0(v0, v27, v28) ; v27 = 0, v28 = 0
;; @0102 jump block3(v21)
diff --git a/tests/disas/component-model/multiple-instantiations-makes-imports-unknown.wat b/tests/disas/component-model/multiple-instantiations-makes-imports-unknown.wat
index f1a5f2c4b8..e7feef92a2 100644
--- a/tests/disas/component-model/multiple-instantiations-makes-imports-unknown.wat
+++ b/tests/disas/component-model/multiple-instantiations-makes-imports-unknown.wat
@@ -129,7 +129,7 @@
;; @0080 brif v13, block3(v15), block2
;;
;; block2 cold:
-;; v25 = iconst.i32 0
+;; @007e v25 = iconst.i32 0
;; v26 = iconst.i64 0
;; @0080 v19 = call fn0(v0, v25, v26) ; v25 = 0, v26 = 0
;; @0080 jump block3(v19)
@@ -205,7 +205,7 @@
;; @010d brif v13, block3(v15), block2
;;
;; block2 cold:
-;; v25 = iconst.i32 0
+;; @010b v25 = iconst.i32 0
;; v26 = iconst.i64 0
;; @010d v19 = call fn0(v0, v25, v26) ; v25 = 0, v26 = 0
;; @010d jump block3(v19)
@@ -287,7 +287,7 @@
;; @0190 brif v15, block3(v17), block2
;;
;; block2 cold:
-;; v27 = iconst.i32 0
+;; @018e v27 = iconst.i32 0
;; v28 = iconst.i64 0
;; @0190 v21 = call fn0(v0, v27, v28) ; v27 = 0, v28 = 0
;; @0190 jump block3(v21)
diff --git a/tests/disas/component-model/reexported-ambiguous-entities.wat b/tests/disas/component-model/reexported-ambiguous-entities.wat
index 638f17b049..df0e863fe8 100644
--- a/tests/disas/component-model/reexported-ambiguous-entities.wat
+++ b/tests/disas/component-model/reexported-ambiguous-entities.wat
@@ -152,7 +152,7 @@
;; @0080 brif v13, block3(v15), block2
;;
;; block2 cold:
-;; v25 = iconst.i32 0
+;; @007e v25 = iconst.i32 0
;; v26 = iconst.i64 0
;; @0080 v19 = call fn0(v0, v25, v26) ; v25 = 0, v26 = 0
;; @0080 jump block3(v19)
@@ -228,7 +228,7 @@
;; @010d brif v13, block3(v15), block2
;;
;; block2 cold:
-;; v25 = iconst.i32 0
+;; @010b v25 = iconst.i32 0
;; v26 = iconst.i64 0
;; @010d v19 = call fn0(v0, v25, v26) ; v25 = 0, v26 = 0
;; @010d jump block3(v19)
@@ -310,7 +310,7 @@
;; @019f brif v15, block3(v17), block2
;;
;; block2 cold:
-;; v27 = iconst.i32 0
+;; @019d v27 = iconst.i32 0
;; v28 = iconst.i64 0
;; @019f v21 = call fn0(v0, v27, v28) ; v27 = 0, v28 = 0
;; @019f jump block3(v21)
@@ -392,7 +392,7 @@
;; @0224 brif v15, block3(v17), block2
;;
;; block2 cold:
-;; v27 = iconst.i32 0
+;; @0222 v27 = iconst.i32 0
;; v28 = iconst.i64 0
;; @0224 v21 = call fn0(v0, v27, v28) ; v27 = 0, v28 = 0
;; @0224 jump block3(v21)
diff --git a/tests/disas/component-model/reexported-entities-to-imported-module.wat b/tests/disas/component-model/reexported-entities-to-imported-module.wat
index abdd38ace6..a9993d3630 100644
--- a/tests/disas/component-model/reexported-entities-to-imported-module.wat
+++ b/tests/disas/component-model/reexported-entities-to-imported-module.wat
@@ -125,7 +125,7 @@
;; @00a8 brif v13, block3(v15), block2
;;
;; block2 cold:
-;; v25 = iconst.i32 0
+;; @00a6 v25 = iconst.i32 0
;; v26 = iconst.i64 0
;; @00a8 v19 = call fn0(v0, v25, v26) ; v25 = 0, v26 = 0
;; @00a8 jump block3(v19)
@@ -207,7 +207,7 @@
;; @0139 brif v15, block3(v17), block2
;;
;; block2 cold:
-;; v27 = iconst.i32 0
+;; @0137 v27 = iconst.i32 0
;; v28 = iconst.i64 0
;; @0139 v21 = call fn0(v0, v27, v28) ; v27 = 0, v28 = 0
;; @0139 jump block3(v21)
diff --git a/tests/disas/component-model/reexported-known-entities.wat b/tests/disas/component-model/reexported-known-entities.wat
index c6705033d8..79e7d5c484 100644
--- a/tests/disas/component-model/reexported-known-entities.wat
+++ b/tests/disas/component-model/reexported-known-entities.wat
@@ -131,7 +131,7 @@
;; @0080 brif v13, block3(v15), block2
;;
;; block2 cold:
-;; v25 = iconst.i32 0
+;; @007e v25 = iconst.i32 0
;; v26 = iconst.i64 0
;; @0080 v19 = call fn0(v0, v25, v26) ; v25 = 0, v26 = 0
;; @0080 jump block3(v19)
@@ -213,7 +213,7 @@
;; @0111 brif v15, block3(v17), block2
;;
;; block2 cold:
-;; v27 = iconst.i32 0
+;; @010f v27 = iconst.i32 0
;; v28 = iconst.i64 0
;; @0111 v21 = call fn0(v0, v27, v28) ; v27 = 0, v28 = 0
;; @0111 jump block3(v21)
@@ -295,7 +295,7 @@
;; @0196 brif v15, block3(v17), block2
;;
;; block2 cold:
-;; v27 = iconst.i32 0
+;; @0194 v27 = iconst.i32 0
;; v28 = iconst.i64 0
;; @0196 v21 = call fn0(v0, v27, v28) ; v27 = 0, v28 = 0
;; @0196 jump block3(v21)
diff --git a/tests/disas/foo.wat b/tests/disas/foo.wat
index 65c14af1d4..66963d0396 100644
--- a/tests/disas/foo.wat
+++ b/tests/disas/foo.wat
@@ -77,18 +77,18 @@
;; @004d v43 = ireduce.i32 v42
;; @004d v44 = icmp uge v40, v43
;; @004d v45 = uextend.i64 v40
-;; v68 = iconst.i64 3
-;; v69 = ishl v45, v68 ; v68 = 3
+;; @0043 v68 = iconst.i64 3
+;; @004d v69 = ishl v45, v68 ; v68 = 3
;; @004d v50 = iadd v47, v69
-;; v70 = iconst.i64 0
-;; v71 = select_spectre_guard v44, v70, v50 ; v70 = 0
+;; @0043 v70 = iconst.i64 0
+;; @004d v71 = select_spectre_guard v44, v70, v50 ; v70 = 0
;; @004d v53 = load.i64 user6 aligned region8 v71
-;; v72 = iconst.i64 -2
-;; v73 = band v53, v72 ; v72 = -2
+;; @0043 v72 = iconst.i64 -2
+;; @004d v73 = band v53, v72 ; v72 = -2
;; @004d brif v53, block5(v73), block4
;;
;; block4 cold:
-;; v74 = iconst.i32 0
+;; @0043 v74 = iconst.i32 0
;; @004d v59 = call fn0(v0, v74, v45) ; v74 = 0
;; @004d jump block5(v59)
;;
diff --git a/tests/disas/gc/alias-region-exn-payload.wat b/tests/disas/gc/alias-region-exn-payload.wat
index eb82d987df..c11e483c5b 100644
--- a/tests/disas/gc/alias-region-exn-payload.wat
+++ b/tests/disas/gc/alias-region-exn-payload.wat
@@ -69,8 +69,8 @@
;; block2:
;; v52 = iconst.i32 0x0400_0020
;; @003a v25 = load.i64 notrap aligned readonly can_move region5 v19+32
-;; v58 = band.i32 v14, v51 ; v51 = -8
-;; v59 = uextend.i64 v58
+;; @003a v58 = band.i32 v14, v51 ; v51 = -8
+;; @003a v59 = uextend.i64 v58
;; @003a v27 = iadd v25, v59
;; @003a store user2 region8 v52, v27 ; v52 = 0x0400_0020
;; @003a v30 = load.i64 notrap aligned readonly can_move region6 v0+40
diff --git a/tests/disas/gc/array-copy-with-fuel.wat b/tests/disas/gc/array-copy-with-fuel.wat
index f1ba124942..5a16f85fd8 100644
--- a/tests/disas/gc/array-copy-with-fuel.wat
+++ b/tests/disas/gc/array-copy-with-fuel.wat
@@ -42,7 +42,7 @@
;; @0020 brif v12, block2, block3(v10)
;;
;; block2:
-;; v172 = iadd.i64 v8, v9 ; v9 = 1
+;; @0020 v172 = iadd.i64 v8, v9 ; v9 = 1
;; @0020 store notrap aligned region2 v172, v7
;; @0020 v14 = call fn0(v0), stack_map=[i32 @ ss0+0, i32 @ ss1+0]
;; @0020 v16 = load.i64 notrap aligned region2 v7
@@ -105,31 +105,31 @@
;; block5(v98: i64, v99: i64, v100: i32):
;; @002b v103 = load.i32 user2 little region6 v99
;; @002b store user2 little region6 v103, v98
-;; v178 = iconst.i64 4
-;; v179 = iadd v99, v178 ; v178 = 4
+;; @002b v178 = iconst.i64 4
+;; @002b v179 = iadd v99, v178 ; v178 = 4
;; @002b v110 = icmp eq v179, v95
-;; v180 = iadd v98, v178 ; v178 = 4
-;; v181 = iconst.i32 1
-;; v182 = iadd v100, v181 ; v181 = 1
+;; @002b v180 = iadd v98, v178 ; v178 = 4
+;; @002b v181 = iconst.i32 1
+;; @002b v182 = iadd v100, v181 ; v181 = 1
;; @002b brif v110, block7, block5(v180, v179, v182)
;;
;; block6(v111: i64, v112: i64, v113: i32):
-;; v173 = iconst.i64 4
-;; v174 = isub v112, v173 ; v173 = 4
+;; @002b v173 = iconst.i64 4
+;; @002b v174 = isub v112, v173 ; v173 = 4
;; @002b v122 = load.i32 user2 little region6 v174
-;; v175 = isub v111, v173 ; v173 = 4
+;; @002b v175 = isub v111, v173 ; v173 = 4
;; @002b store user2 little region6 v122, v175
;; @002b v123 = icmp eq v174, v69
-;; v176 = iconst.i32 1
-;; v177 = isub v113, v176 ; v176 = 1
+;; @002b v176 = iconst.i32 1
+;; @002b v177 = isub v113, v176 ; v176 = 1
;; @002b brif v123, block7, block6(v175, v174, v177)
;;
;; block7:
;; @002b v128 = iconst.i64 6
;; @002b v129 = iadd.i64 v125, v128 ; v128 = 6
;; @002b v133 = iadd v129, v31
-;; v183 = iconst.i64 0
-;; v184 = icmp sge v133, v183 ; v183 = 0
+;; @0020 v183 = iconst.i64 0
+;; @002b v184 = icmp sge v133, v183 ; v183 = 0
;; @002b brif v184, block8, block9(v133)
;;
;; block8:
diff --git a/tests/disas/gc/array-new-data.wat b/tests/disas/gc/array-new-data.wat
index 5c41ecaf62..b8d5f3584c 100644
--- a/tests/disas/gc/array-new-data.wat
+++ b/tests/disas/gc/array-new-data.wat
@@ -137,15 +137,15 @@
;; v125 = band v121, v124 ; v124 = -16
;; v127 = iadd.i32 v24, v125
;; @0025 store notrap aligned region5 v127, v23
-;; v141 = iconst.i32 -1476395002
-;; v142 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v143 = load.i64 notrap aligned readonly can_move region9 v142+32
+;; @0025 v141 = iconst.i32 -1476395002
+;; @0025 v142 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @0025 v143 = load.i64 notrap aligned readonly can_move region9 v142+32
;; @0025 v48 = iadd v143, v31
;; @0025 store user2 region10 v141, v48 ; v141 = -1476395002
-;; v144 = load.i64 notrap aligned readonly can_move region7 v0+40
-;; v145 = load.i32 notrap aligned readonly can_move region8 v144
+;; @0025 v144 = load.i64 notrap aligned readonly can_move region7 v0+40
+;; @0025 v145 = load.i32 notrap aligned readonly can_move region8 v144
;; @0025 store user2 region11 v145, v48+4
-;; v146 = band.i64 v29, v28 ; v28 = -16
+;; @0025 v146 = band.i64 v29, v28 ; v28 = -16
;; @0025 istore32 user2 region12 v146, v48+8
;; @0025 jump block4(v24, v48)
;;
@@ -168,8 +168,8 @@
;; @0025 v55 = iadd v53, v54 ; v54 = 16
;; @0025 store.i32 user2 region13 v3, v55
;; @0025 trapz v52, user16
-;; v147 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v148 = load.i64 notrap aligned readonly can_move region9 v147+32
+;; @0025 v147 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @0025 v148 = load.i64 notrap aligned readonly can_move region9 v147+32
;; @0025 v57 = uextend.i64 v52
;; @0025 v60 = iadd v148, v57
;; @0025 v62 = iadd v60, v54 ; v54 = 16
diff --git a/tests/disas/gc/array-new-default-anyref.wat b/tests/disas/gc/array-new-default-anyref.wat
index 38948f9e36..e3061187ef 100644
--- a/tests/disas/gc/array-new-default-anyref.wat
+++ b/tests/disas/gc/array-new-default-anyref.wat
@@ -63,15 +63,15 @@
;; v108 = band v104, v107 ; v107 = -16
;; v110 = iadd.i32 v12, v108
;; @001f store notrap aligned region3 v110, v11
-;; v128 = iconst.i32 -1476394994
-;; v129 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v130 = load.i64 notrap aligned readonly can_move region7 v129+32
+;; @001f v128 = iconst.i32 -1476394994
+;; @001f v129 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @001f v130 = load.i64 notrap aligned readonly can_move region7 v129+32
;; @001f v36 = iadd v130, v19
;; @001f store user2 region8 v128, v36 ; v128 = -1476394994
-;; v131 = load.i64 notrap aligned readonly can_move region5 v0+40
-;; v132 = load.i32 notrap aligned readonly can_move region6 v131
+;; @001f v131 = load.i64 notrap aligned readonly can_move region5 v0+40
+;; @001f v132 = load.i32 notrap aligned readonly can_move region6 v131
;; @001f store user2 region9 v132, v36+4
-;; v133 = band.i64 v17, v16 ; v16 = -16
+;; @001f v133 = band.i64 v17, v16 ; v16 = -16
;; @001f istore32 user2 region10 v133, v36+8
;; @001f jump block4(v12, v36)
;;
@@ -92,8 +92,8 @@
;; @001f v43 = iadd v41, v42 ; v42 = 16
;; @001f store.i32 user2 region11 v2, v43
;; @001f trapz v40, user16
-;; v134 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v135 = load.i64 notrap aligned readonly can_move region7 v134+32
+;; @001f v134 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @001f v135 = load.i64 notrap aligned readonly can_move region7 v134+32
;; @001f v46 = uextend.i64 v40
;; @001f v49 = iadd v135, v46
;; @001f v51 = iadd v49, v42 ; v42 = 16
@@ -115,10 +115,10 @@
;; @001f brif v126, block6, block5(v65)
;;
;; block5(v83: i64):
-;; v136 = iconst.i32 0
+;; @001f v136 = iconst.i32 0
;; @001f store user2 little region13 v136, v83 ; v136 = 0
-;; v137 = iconst.i64 4
-;; v138 = iadd v83, v137 ; v137 = 4
+;; @001f v137 = iconst.i64 4
+;; @001f v138 = iadd v83, v137 ; v137 = 4
;; @001f v86 = icmp eq v138, v80
;; @001f brif v86, block6, block5(v138)
;;
diff --git a/tests/disas/gc/array-new-default-exnref.wat b/tests/disas/gc/array-new-default-exnref.wat
index e3660b4312..da1c883350 100644
--- a/tests/disas/gc/array-new-default-exnref.wat
+++ b/tests/disas/gc/array-new-default-exnref.wat
@@ -63,15 +63,15 @@
;; v108 = band v104, v107 ; v107 = -16
;; v110 = iadd.i32 v12, v108
;; @001f store notrap aligned region3 v110, v11
-;; v128 = iconst.i32 -1476394994
-;; v129 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v130 = load.i64 notrap aligned readonly can_move region7 v129+32
+;; @001f v128 = iconst.i32 -1476394994
+;; @001f v129 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @001f v130 = load.i64 notrap aligned readonly can_move region7 v129+32
;; @001f v36 = iadd v130, v19
;; @001f store user2 region8 v128, v36 ; v128 = -1476394994
-;; v131 = load.i64 notrap aligned readonly can_move region5 v0+40
-;; v132 = load.i32 notrap aligned readonly can_move region6 v131
+;; @001f v131 = load.i64 notrap aligned readonly can_move region5 v0+40
+;; @001f v132 = load.i32 notrap aligned readonly can_move region6 v131
;; @001f store user2 region9 v132, v36+4
-;; v133 = band.i64 v17, v16 ; v16 = -16
+;; @001f v133 = band.i64 v17, v16 ; v16 = -16
;; @001f istore32 user2 region10 v133, v36+8
;; @001f jump block4(v12, v36)
;;
@@ -92,8 +92,8 @@
;; @001f v43 = iadd v41, v42 ; v42 = 16
;; @001f store.i32 user2 region11 v2, v43
;; @001f trapz v40, user16
-;; v134 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v135 = load.i64 notrap aligned readonly can_move region7 v134+32
+;; @001f v134 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @001f v135 = load.i64 notrap aligned readonly can_move region7 v134+32
;; @001f v46 = uextend.i64 v40
;; @001f v49 = iadd v135, v46
;; @001f v51 = iadd v49, v42 ; v42 = 16
@@ -115,10 +115,10 @@
;; @001f brif v126, block6, block5(v65)
;;
;; block5(v83: i64):
-;; v136 = iconst.i32 0
+;; @001f v136 = iconst.i32 0
;; @001f store user2 little region13 v136, v83 ; v136 = 0
-;; v137 = iconst.i64 4
-;; v138 = iadd v83, v137 ; v137 = 4
+;; @001f v137 = iconst.i64 4
+;; @001f v138 = iadd v83, v137 ; v137 = 4
;; @001f v86 = icmp eq v138, v80
;; @001f brif v86, block6, block5(v138)
;;
diff --git a/tests/disas/gc/array-new-default-externref.wat b/tests/disas/gc/array-new-default-externref.wat
index a96c551978..baf295cf7f 100644
--- a/tests/disas/gc/array-new-default-externref.wat
+++ b/tests/disas/gc/array-new-default-externref.wat
@@ -63,15 +63,15 @@
;; v108 = band v104, v107 ; v107 = -16
;; v110 = iadd.i32 v12, v108
;; @001f store notrap aligned region3 v110, v11
-;; v128 = iconst.i32 -1476394994
-;; v129 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v130 = load.i64 notrap aligned readonly can_move region7 v129+32
+;; @001f v128 = iconst.i32 -1476394994
+;; @001f v129 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @001f v130 = load.i64 notrap aligned readonly can_move region7 v129+32
;; @001f v36 = iadd v130, v19
;; @001f store user2 region8 v128, v36 ; v128 = -1476394994
-;; v131 = load.i64 notrap aligned readonly can_move region5 v0+40
-;; v132 = load.i32 notrap aligned readonly can_move region6 v131
+;; @001f v131 = load.i64 notrap aligned readonly can_move region5 v0+40
+;; @001f v132 = load.i32 notrap aligned readonly can_move region6 v131
;; @001f store user2 region9 v132, v36+4
-;; v133 = band.i64 v17, v16 ; v16 = -16
+;; @001f v133 = band.i64 v17, v16 ; v16 = -16
;; @001f istore32 user2 region10 v133, v36+8
;; @001f jump block4(v12, v36)
;;
@@ -92,8 +92,8 @@
;; @001f v43 = iadd v41, v42 ; v42 = 16
;; @001f store.i32 user2 region11 v2, v43
;; @001f trapz v40, user16
-;; v134 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v135 = load.i64 notrap aligned readonly can_move region7 v134+32
+;; @001f v134 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @001f v135 = load.i64 notrap aligned readonly can_move region7 v134+32
;; @001f v46 = uextend.i64 v40
;; @001f v49 = iadd v135, v46
;; @001f v51 = iadd v49, v42 ; v42 = 16
@@ -115,10 +115,10 @@
;; @001f brif v126, block6, block5(v65)
;;
;; block5(v83: i64):
-;; v136 = iconst.i32 0
+;; @001f v136 = iconst.i32 0
;; @001f store user2 little region13 v136, v83 ; v136 = 0
-;; v137 = iconst.i64 4
-;; v138 = iadd v83, v137 ; v137 = 4
+;; @001f v137 = iconst.i64 4
+;; @001f v138 = iadd v83, v137 ; v137 = 4
;; @001f v86 = icmp eq v138, v80
;; @001f brif v86, block6, block5(v138)
;;
diff --git a/tests/disas/gc/array-new-default-f32.wat b/tests/disas/gc/array-new-default-f32.wat
index 7d91be2f87..82a11269ba 100644
--- a/tests/disas/gc/array-new-default-f32.wat
+++ b/tests/disas/gc/array-new-default-f32.wat
@@ -66,15 +66,15 @@
;; v111 = band v107, v110 ; v110 = -16
;; v113 = iadd.i32 v12, v111
;; @001f store notrap aligned region3 v113, v11
-;; v129 = iconst.i32 -1476395002
-;; v130 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v131 = load.i64 notrap aligned readonly can_move region7 v130+32
+;; @001f v129 = iconst.i32 -1476395002
+;; @001f v130 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @001f v131 = load.i64 notrap aligned readonly can_move region7 v130+32
;; @001f v36 = iadd v131, v19
;; @001f store user2 region8 v129, v36 ; v129 = -1476395002
-;; v132 = load.i64 notrap aligned readonly can_move region5 v0+40
-;; v133 = load.i32 notrap aligned readonly can_move region6 v132
+;; @001f v132 = load.i64 notrap aligned readonly can_move region5 v0+40
+;; @001f v133 = load.i32 notrap aligned readonly can_move region6 v132
;; @001f store user2 region9 v133, v36+4
-;; v134 = band.i64 v17, v16 ; v16 = -16
+;; @001f v134 = band.i64 v17, v16 ; v16 = -16
;; @001f istore32 user2 region10 v134, v36+8
;; @001f jump block4(v12, v36)
;;
@@ -97,8 +97,8 @@
;; @001f v43 = iadd v41, v42 ; v42 = 16
;; @001f store.i32 user2 region11 v2, v43
;; @001f trapz v40, user16
-;; v135 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v136 = load.i64 notrap aligned readonly can_move region7 v135+32
+;; @001f v135 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @001f v136 = load.i64 notrap aligned readonly can_move region7 v135+32
;; @001f v46 = uextend.i64 v40
;; @001f v49 = iadd v136, v46
;; @001f v51 = iadd v49, v42 ; v42 = 16
diff --git a/tests/disas/gc/array-new-default-f64.wat b/tests/disas/gc/array-new-default-f64.wat
index 180e150d14..cf5527be09 100644
--- a/tests/disas/gc/array-new-default-f64.wat
+++ b/tests/disas/gc/array-new-default-f64.wat
@@ -66,15 +66,15 @@
;; v111 = band v107, v110 ; v110 = -16
;; v113 = iadd.i32 v12, v111
;; @001f store notrap aligned region3 v113, v11
-;; v129 = iconst.i32 -1476395002
-;; v130 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v131 = load.i64 notrap aligned readonly can_move region7 v130+32
+;; @001f v129 = iconst.i32 -1476395002
+;; @001f v130 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @001f v131 = load.i64 notrap aligned readonly can_move region7 v130+32
;; @001f v36 = iadd v131, v19
;; @001f store user2 region8 v129, v36 ; v129 = -1476395002
-;; v132 = load.i64 notrap aligned readonly can_move region5 v0+40
-;; v133 = load.i32 notrap aligned readonly can_move region6 v132
+;; @001f v132 = load.i64 notrap aligned readonly can_move region5 v0+40
+;; @001f v133 = load.i32 notrap aligned readonly can_move region6 v132
;; @001f store user2 region9 v133, v36+4
-;; v134 = band.i64 v17, v16 ; v16 = -16
+;; @001f v134 = band.i64 v17, v16 ; v16 = -16
;; @001f istore32 user2 region10 v134, v36+8
;; @001f jump block4(v12, v36)
;;
@@ -97,8 +97,8 @@
;; @001f v43 = iadd v41, v42 ; v42 = 16
;; @001f store.i32 user2 region11 v2, v43
;; @001f trapz v40, user16
-;; v135 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v136 = load.i64 notrap aligned readonly can_move region7 v135+32
+;; @001f v135 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @001f v136 = load.i64 notrap aligned readonly can_move region7 v135+32
;; @001f v46 = uextend.i64 v40
;; @001f v49 = iadd v136, v46
;; @001f v51 = iadd v49, v42 ; v42 = 16
diff --git a/tests/disas/gc/array-new-default-funcref.wat b/tests/disas/gc/array-new-default-funcref.wat
index bf39c0b657..e1ce3519c9 100644
--- a/tests/disas/gc/array-new-default-funcref.wat
+++ b/tests/disas/gc/array-new-default-funcref.wat
@@ -67,15 +67,15 @@
;; v119 = band v115, v118 ; v118 = -16
;; v121 = iadd.i32 v12, v119
;; @001f store notrap aligned region3 v121, v11
-;; v138 = iconst.i32 -1476395002
-;; v139 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v140 = load.i64 notrap aligned readonly can_move region7 v139+32
+;; @001f v138 = iconst.i32 -1476395002
+;; @001f v139 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @001f v140 = load.i64 notrap aligned readonly can_move region7 v139+32
;; @001f v36 = iadd v140, v19
;; @001f store user2 region8 v138, v36 ; v138 = -1476395002
-;; v141 = load.i64 notrap aligned readonly can_move region5 v0+40
-;; v142 = load.i32 notrap aligned readonly can_move region6 v141
+;; @001f v141 = load.i64 notrap aligned readonly can_move region5 v0+40
+;; @001f v142 = load.i32 notrap aligned readonly can_move region6 v141
;; @001f store user2 region9 v142, v36+4
-;; v143 = band.i64 v17, v16 ; v16 = -16
+;; @001f v143 = band.i64 v17, v16 ; v16 = -16
;; @001f istore32 user2 region10 v143, v36+8
;; @001f jump block4(v12, v36)
;;
@@ -98,8 +98,8 @@
;; @001f v43 = iadd v41, v42 ; v42 = 16
;; @001f store.i32 user2 region11 v2, v43
;; @001f trapz v40, user16
-;; v144 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v145 = load.i64 notrap aligned readonly can_move region7 v144+32
+;; @001f v144 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @001f v145 = load.i64 notrap aligned readonly can_move region7 v144+32
;; @001f v46 = uextend.i64 v40
;; @001f v49 = iadd v145, v46
;; @001f v51 = iadd v49, v42 ; v42 = 16
@@ -125,8 +125,8 @@
;;
;; block5(v85: i64):
;; @001f store.i32 notrap aligned little region13 v81, v85
-;; v146 = iconst.i64 4
-;; v147 = iadd v85, v146 ; v146 = 4
+;; @001f v146 = iconst.i64 4
+;; @001f v147 = iadd v85, v146 ; v146 = 4
;; @001f v88 = icmp eq v147, v82
;; @001f brif v88, block6, block5(v147)
;;
diff --git a/tests/disas/gc/array-new-default-i16.wat b/tests/disas/gc/array-new-default-i16.wat
index a68ddec090..7347936835 100644
--- a/tests/disas/gc/array-new-default-i16.wat
+++ b/tests/disas/gc/array-new-default-i16.wat
@@ -65,15 +65,15 @@
;; v116 = band v112, v115 ; v115 = -16
;; v118 = iadd.i32 v12, v116
;; @001f store notrap aligned region3 v118, v11
-;; v139 = iconst.i32 -1476395002
-;; v140 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v141 = load.i64 notrap aligned readonly can_move region7 v140+32
+;; @001f v139 = iconst.i32 -1476395002
+;; @001f v140 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @001f v141 = load.i64 notrap aligned readonly can_move region7 v140+32
;; @001f v36 = iadd v141, v19
;; @001f store user2 region8 v139, v36 ; v139 = -1476395002
-;; v142 = load.i64 notrap aligned readonly can_move region5 v0+40
-;; v143 = load.i32 notrap aligned readonly can_move region6 v142
+;; @001f v142 = load.i64 notrap aligned readonly can_move region5 v0+40
+;; @001f v143 = load.i32 notrap aligned readonly can_move region6 v142
;; @001f store user2 region9 v143, v36+4
-;; v144 = band.i64 v17, v16 ; v16 = -16
+;; @001f v144 = band.i64 v17, v16 ; v16 = -16
;; @001f istore32 user2 region10 v144, v36+8
;; @001f jump block4(v12, v36)
;;
@@ -96,8 +96,8 @@
;; @001f v43 = iadd v41, v42 ; v42 = 16
;; @001f store.i32 user2 region11 v2, v43
;; @001f trapz v40, user16
-;; v145 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v146 = load.i64 notrap aligned readonly can_move region7 v145+32
+;; @001f v145 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @001f v146 = load.i64 notrap aligned readonly can_move region7 v145+32
;; @001f v46 = uextend.i64 v40
;; @001f v49 = iadd v146, v46
;; @001f v51 = iadd v49, v42 ; v42 = 16
diff --git a/tests/disas/gc/array-new-default-i32.wat b/tests/disas/gc/array-new-default-i32.wat
index 805043dbb1..36f080776d 100644
--- a/tests/disas/gc/array-new-default-i32.wat
+++ b/tests/disas/gc/array-new-default-i32.wat
@@ -66,15 +66,15 @@
;; v111 = band v107, v110 ; v110 = -16
;; v113 = iadd.i32 v12, v111
;; @001f store notrap aligned region3 v113, v11
-;; v129 = iconst.i32 -1476395002
-;; v130 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v131 = load.i64 notrap aligned readonly can_move region7 v130+32
+;; @001f v129 = iconst.i32 -1476395002
+;; @001f v130 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @001f v131 = load.i64 notrap aligned readonly can_move region7 v130+32
;; @001f v36 = iadd v131, v19
;; @001f store user2 region8 v129, v36 ; v129 = -1476395002
-;; v132 = load.i64 notrap aligned readonly can_move region5 v0+40
-;; v133 = load.i32 notrap aligned readonly can_move region6 v132
+;; @001f v132 = load.i64 notrap aligned readonly can_move region5 v0+40
+;; @001f v133 = load.i32 notrap aligned readonly can_move region6 v132
;; @001f store user2 region9 v133, v36+4
-;; v134 = band.i64 v17, v16 ; v16 = -16
+;; @001f v134 = band.i64 v17, v16 ; v16 = -16
;; @001f istore32 user2 region10 v134, v36+8
;; @001f jump block4(v12, v36)
;;
@@ -97,8 +97,8 @@
;; @001f v43 = iadd v41, v42 ; v42 = 16
;; @001f store.i32 user2 region11 v2, v43
;; @001f trapz v40, user16
-;; v135 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v136 = load.i64 notrap aligned readonly can_move region7 v135+32
+;; @001f v135 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @001f v136 = load.i64 notrap aligned readonly can_move region7 v135+32
;; @001f v46 = uextend.i64 v40
;; @001f v49 = iadd v136, v46
;; @001f v51 = iadd v49, v42 ; v42 = 16
diff --git a/tests/disas/gc/array-new-default-i64.wat b/tests/disas/gc/array-new-default-i64.wat
index b467ae6503..2638ca1a1b 100644
--- a/tests/disas/gc/array-new-default-i64.wat
+++ b/tests/disas/gc/array-new-default-i64.wat
@@ -66,15 +66,15 @@
;; v111 = band v107, v110 ; v110 = -16
;; v113 = iadd.i32 v12, v111
;; @001f store notrap aligned region3 v113, v11
-;; v128 = iconst.i32 -1476395002
-;; v129 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v130 = load.i64 notrap aligned readonly can_move region7 v129+32
+;; @001f v128 = iconst.i32 -1476395002
+;; @001f v129 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @001f v130 = load.i64 notrap aligned readonly can_move region7 v129+32
;; @001f v36 = iadd v130, v19
;; @001f store user2 region8 v128, v36 ; v128 = -1476395002
-;; v131 = load.i64 notrap aligned readonly can_move region5 v0+40
-;; v132 = load.i32 notrap aligned readonly can_move region6 v131
+;; @001f v131 = load.i64 notrap aligned readonly can_move region5 v0+40
+;; @001f v132 = load.i32 notrap aligned readonly can_move region6 v131
;; @001f store user2 region9 v132, v36+4
-;; v133 = band.i64 v17, v16 ; v16 = -16
+;; @001f v133 = band.i64 v17, v16 ; v16 = -16
;; @001f istore32 user2 region10 v133, v36+8
;; @001f jump block4(v12, v36)
;;
@@ -97,8 +97,8 @@
;; @001f v43 = iadd v41, v42 ; v42 = 16
;; @001f store.i32 user2 region11 v2, v43
;; @001f trapz v40, user16
-;; v134 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v135 = load.i64 notrap aligned readonly can_move region7 v134+32
+;; @001f v134 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @001f v135 = load.i64 notrap aligned readonly can_move region7 v134+32
;; @001f v46 = uextend.i64 v40
;; @001f v49 = iadd v135, v46
;; @001f v51 = iadd v49, v42 ; v42 = 16
diff --git a/tests/disas/gc/array-new-default-i8.wat b/tests/disas/gc/array-new-default-i8.wat
index cd040313d5..40ce509203 100644
--- a/tests/disas/gc/array-new-default-i8.wat
+++ b/tests/disas/gc/array-new-default-i8.wat
@@ -62,15 +62,15 @@
;; v101 = band v97, v100 ; v100 = -16
;; v103 = iadd.i32 v12, v101
;; @001f store notrap aligned region3 v103, v11
-;; v117 = iconst.i32 -1476395002
-;; v118 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v119 = load.i64 notrap aligned readonly can_move region7 v118+32
+;; @001f v117 = iconst.i32 -1476395002
+;; @001f v118 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @001f v119 = load.i64 notrap aligned readonly can_move region7 v118+32
;; @001f v36 = iadd v119, v19
;; @001f store user2 region8 v117, v36 ; v117 = -1476395002
-;; v120 = load.i64 notrap aligned readonly can_move region5 v0+40
-;; v121 = load.i32 notrap aligned readonly can_move region6 v120
+;; @001f v120 = load.i64 notrap aligned readonly can_move region5 v0+40
+;; @001f v121 = load.i32 notrap aligned readonly can_move region6 v120
;; @001f store user2 region9 v121, v36+4
-;; v122 = band.i64 v17, v16 ; v16 = -16
+;; @001f v122 = band.i64 v17, v16 ; v16 = -16
;; @001f istore32 user2 region10 v122, v36+8
;; @001f jump block4(v12, v36)
;;
@@ -93,8 +93,8 @@
;; @001f v43 = iadd v41, v42 ; v42 = 16
;; @001f store.i32 user2 region11 v2, v43
;; @001f trapz v40, user16
-;; v123 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v124 = load.i64 notrap aligned readonly can_move region7 v123+32
+;; @001f v123 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @001f v124 = load.i64 notrap aligned readonly can_move region7 v123+32
;; @001f v46 = uextend.i64 v40
;; @001f v49 = iadd v124, v46
;; @001f v51 = iadd v49, v42 ; v42 = 16
diff --git a/tests/disas/gc/copying/alias-region-header.wat b/tests/disas/gc/copying/alias-region-header.wat
index cb6c7fa47f..7a603ca5f2 100644
--- a/tests/disas/gc/copying/alias-region-header.wat
+++ b/tests/disas/gc/copying/alias-region-header.wat
@@ -48,16 +48,16 @@
;; @002b brif v17, block2, block3
;;
;; block2:
-;; v62 = iconst.i32 32
+;; @002b v62 = iconst.i32 32
;; v60 = iadd.i32 v7, v62 ; v62 = 32
;; @002b store notrap aligned region3 v60, v6
-;; v63 = iconst.i32 -1342177278
-;; v64 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v65 = load.i64 notrap aligned readonly can_move region7 v64+32
+;; @002b v63 = iconst.i32 -1342177278
+;; @002b v64 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @002b v65 = load.i64 notrap aligned readonly can_move region7 v64+32
;; @002b v31 = iadd v65, v14
;; @002b store user2 region8 v63, v31 ; v63 = -1342177278
-;; v66 = load.i64 notrap aligned readonly can_move region5 v0+40
-;; v67 = load.i32 notrap aligned readonly can_move region6 v66
+;; @002b v66 = load.i64 notrap aligned readonly can_move region5 v0+40
+;; @002b v67 = load.i32 notrap aligned readonly can_move region6 v66
;; @002b store user2 region9 v67, v31+4
;; v68 = iconst.i64 32
;; @002b istore32 user2 region10 v68, v31+8 ; v68 = 32
@@ -82,8 +82,8 @@
;; @002b v38 = iadd v36, v37 ; v37 = 16
;; @002b store user2 little region11 v4, v38 ; v4 = 1
;; @002e trapz v35, user16
-;; v69 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v70 = load.i64 notrap aligned readonly can_move region7 v69+32
+;; @002b v69 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @002b v70 = load.i64 notrap aligned readonly can_move region7 v69+32
;; @002e v39 = uextend.i64 v35
;; @002e v42 = iadd v70, v39
;; @002e v44 = iadd v42, v37 ; v37 = 16
diff --git a/tests/disas/gc/copying/array-fill.wat b/tests/disas/gc/copying/array-fill.wat
index fc0900c69a..c9d30505b2 100644
--- a/tests/disas/gc/copying/array-fill.wat
+++ b/tests/disas/gc/copying/array-fill.wat
@@ -54,8 +54,8 @@
;;
;; block2(v43: i64):
;; @0027 store.i64 user2 little region5 v4, v43
-;; v57 = iconst.i64 8
-;; v58 = iadd v43, v57 ; v57 = 8
+;; @0027 v57 = iconst.i64 8
+;; @0027 v58 = iadd v43, v57 ; v57 = 8
;; @0027 v46 = icmp eq v58, v40
;; @0027 brif v46, block3, block2(v58)
;;
diff --git a/tests/disas/gc/copying/array-new-fixed-of-gc-refs.wat b/tests/disas/gc/copying/array-new-fixed-of-gc-refs.wat
index db824b0822..2cb005639e 100644
--- a/tests/disas/gc/copying/array-new-fixed-of-gc-refs.wat
+++ b/tests/disas/gc/copying/array-new-fixed-of-gc-refs.wat
@@ -57,15 +57,15 @@
;; v231 = iconst.i32 32
;; v165 = iadd.i32 v15, v231 ; v231 = 32
;; @0025 store notrap aligned region3 v165, v14
-;; v232 = iconst.i32 -1476394994
-;; v233 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v234 = load.i64 notrap aligned readonly can_move region7 v233+32
+;; @0025 v232 = iconst.i32 -1476394994
+;; @0025 v233 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @0025 v234 = load.i64 notrap aligned readonly can_move region7 v233+32
;; @0025 v39 = iadd v234, v22
;; @0025 store user2 region8 v232, v39 ; v232 = -1476394994
-;; v235 = load.i64 notrap aligned readonly can_move region5 v0+40
-;; v236 = load.i32 notrap aligned readonly can_move region6 v235
+;; @0025 v235 = load.i64 notrap aligned readonly can_move region5 v0+40
+;; @0025 v236 = load.i32 notrap aligned readonly can_move region6 v235
;; @0025 store user2 region9 v236, v39+4
-;; v237 = iconst.i64 32
+;; @0025 v237 = iconst.i64 32
;; @0025 istore32 user2 region10 v237, v39+8 ; v237 = 32
;; @0025 jump block4(v15, v39)
;;
@@ -88,8 +88,8 @@
;; @0025 v46 = iadd v44, v45 ; v45 = 16
;; @0025 store user2 region11 v5, v46 ; v5 = 3
;; @0025 trapz v43, user16
-;; v238 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v239 = load.i64 notrap aligned readonly can_move region7 v238+32
+;; @0025 v238 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @0025 v239 = load.i64 notrap aligned readonly can_move region7 v238+32
;; @0025 v48 = uextend.i64 v43
;; @0025 v51 = iadd v239, v48
;; @0025 v53 = iadd v51, v45 ; v45 = 16
@@ -98,8 +98,8 @@
;; @0025 v57 = uextend.i64 v54
;; v142 = iconst.i64 2
;; v172 = ishl v57, v142 ; v142 = 2
-;; v240 = iconst.i64 32
-;; v241 = ushr v172, v240 ; v240 = 32
+;; @0025 v240 = iconst.i64 32
+;; @0025 v241 = ushr v172, v240 ; v240 = 32
;; @0025 trapnz v241, user2
;; v179 = iconst.i32 2
;; v180 = ishl v54, v179 ; v179 = 2
diff --git a/tests/disas/gc/copying/array-new-fixed.wat b/tests/disas/gc/copying/array-new-fixed.wat
index 8a891e3e8c..d7a2fe1c4f 100644
--- a/tests/disas/gc/copying/array-new-fixed.wat
+++ b/tests/disas/gc/copying/array-new-fixed.wat
@@ -45,13 +45,13 @@
;; v219 = iconst.i32 48
;; v155 = iadd.i32 v15, v219 ; v219 = 48
;; @0025 store notrap aligned region3 v155, v14
-;; v220 = iconst.i32 -1476395002
-;; v221 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v222 = load.i64 notrap aligned readonly can_move region7 v221+32
+;; @0025 v220 = iconst.i32 -1476395002
+;; @0025 v221 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @0025 v222 = load.i64 notrap aligned readonly can_move region7 v221+32
;; @0025 v39 = iadd v222, v22
;; @0025 store user2 region8 v220, v39 ; v220 = -1476395002
-;; v223 = load.i64 notrap aligned readonly can_move region5 v0+40
-;; v224 = load.i32 notrap aligned readonly can_move region6 v223
+;; @0025 v223 = load.i64 notrap aligned readonly can_move region5 v0+40
+;; @0025 v224 = load.i32 notrap aligned readonly can_move region6 v223
;; @0025 store user2 region9 v224, v39+4
;; v225 = iconst.i64 48
;; @0025 istore32 user2 region10 v225, v39+8 ; v225 = 48
@@ -76,8 +76,8 @@
;; @0025 v46 = iadd v44, v45 ; v45 = 16
;; @0025 store user2 region11 v5, v46 ; v5 = 3
;; @0025 trapz v43, user16
-;; v226 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v227 = load.i64 notrap aligned readonly can_move region7 v226+32
+;; @0025 v226 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @0025 v227 = load.i64 notrap aligned readonly can_move region7 v226+32
;; @0025 v48 = uextend.i64 v43
;; @0025 v51 = iadd v227, v48
;; @0025 v53 = iadd v51, v45 ; v45 = 16
diff --git a/tests/disas/gc/copying/array-new.wat b/tests/disas/gc/copying/array-new.wat
index 93fb114125..c359f97388 100644
--- a/tests/disas/gc/copying/array-new.wat
+++ b/tests/disas/gc/copying/array-new.wat
@@ -62,15 +62,15 @@
;; v108 = band v104, v107 ; v107 = -16
;; v110 = iadd.i32 v13, v108
;; @0022 store notrap aligned region3 v110, v12
-;; v128 = iconst.i32 -1476395002
-;; v129 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v130 = load.i64 notrap aligned readonly can_move region7 v129+32
+;; @0022 v128 = iconst.i32 -1476395002
+;; @0022 v129 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @0022 v130 = load.i64 notrap aligned readonly can_move region7 v129+32
;; @0022 v37 = iadd v130, v20
;; @0022 store user2 region8 v128, v37 ; v128 = -1476395002
-;; v131 = load.i64 notrap aligned readonly can_move region5 v0+40
-;; v132 = load.i32 notrap aligned readonly can_move region6 v131
+;; @0022 v131 = load.i64 notrap aligned readonly can_move region5 v0+40
+;; @0022 v132 = load.i32 notrap aligned readonly can_move region6 v131
;; @0022 store user2 region9 v132, v37+4
-;; v133 = band.i64 v18, v17 ; v17 = -16
+;; @0022 v133 = band.i64 v18, v17 ; v17 = -16
;; @0022 istore32 user2 region10 v133, v37+8
;; @0022 jump block4(v13, v37)
;;
@@ -91,8 +91,8 @@
;; @0022 v44 = iadd v42, v43 ; v43 = 16
;; @0022 store.i32 user2 region11 v3, v44
;; @0022 trapz v41, user16
-;; v134 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v135 = load.i64 notrap aligned readonly can_move region7 v134+32
+;; @0022 v134 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @0022 v135 = load.i64 notrap aligned readonly can_move region7 v134+32
;; @0022 v46 = uextend.i64 v41
;; @0022 v49 = iadd v135, v46
;; @0022 v51 = iadd v49, v43 ; v43 = 16
@@ -115,8 +115,8 @@
;;
;; block5(v83: i64):
;; @0022 store.i64 user2 little region13 v2, v83
-;; v136 = iconst.i64 8
-;; v137 = iadd v83, v136 ; v136 = 8
+;; @0022 v136 = iconst.i64 8
+;; @0022 v137 = iadd v83, v136 ; v136 = 8
;; @0022 v86 = icmp eq v137, v80
;; @0022 brif v86, block6, block5(v137)
;;
diff --git a/tests/disas/gc/copying/br-on-cast-fail.wat b/tests/disas/gc/copying/br-on-cast-fail.wat
index ee67b0786b..71c778af5a 100644
--- a/tests/disas/gc/copying/br-on-cast-fail.wat
+++ b/tests/disas/gc/copying/br-on-cast-fail.wat
@@ -40,7 +40,7 @@
;; block3:
;; @002e v7 = iconst.i32 1
;; @002e v8 = band.i32 v2, v7 ; v7 = 1
-;; v38 = iconst.i32 0
+;; @002e v38 = iconst.i32 0
;; @002e brif v8, block5(v38), block4 ; v38 = 0
;;
;; block4:
@@ -52,7 +52,7 @@
;; @002e v17 = iconst.i32 -1342177280
;; @002e v18 = band v16, v17 ; v17 = -1342177280
;; @002e v19 = icmp eq v18, v17 ; v17 = -1342177280
-;; v39 = iconst.i32 0
+;; @002e v39 = iconst.i32 0
;; @002e brif v19, block6, block5(v39) ; v39 = 0
;;
;; block6:
diff --git a/tests/disas/gc/copying/br-on-cast.wat b/tests/disas/gc/copying/br-on-cast.wat
index acd274b06c..ce5af9901f 100644
--- a/tests/disas/gc/copying/br-on-cast.wat
+++ b/tests/disas/gc/copying/br-on-cast.wat
@@ -40,7 +40,7 @@
;; block3:
;; @002f v7 = iconst.i32 1
;; @002f v8 = band.i32 v2, v7 ; v7 = 1
-;; v38 = iconst.i32 0
+;; @002f v38 = iconst.i32 0
;; @002f brif v8, block5(v38), block4 ; v38 = 0
;;
;; block4:
@@ -52,7 +52,7 @@
;; @002f v17 = iconst.i32 -1342177280
;; @002f v18 = band v16, v17 ; v17 = -1342177280
;; @002f v19 = icmp eq v18, v17 ; v17 = -1342177280
-;; v39 = iconst.i32 0
+;; @002f v39 = iconst.i32 0
;; @002f brif v19, block6, block5(v39) ; v39 = 0
;;
;; block6:
diff --git a/tests/disas/gc/copying/funcref-in-gc-heap-new.wat b/tests/disas/gc/copying/funcref-in-gc-heap-new.wat
index 63a32c84ed..a4e49be810 100644
--- a/tests/disas/gc/copying/funcref-in-gc-heap-new.wat
+++ b/tests/disas/gc/copying/funcref-in-gc-heap-new.wat
@@ -44,16 +44,16 @@
;; @0020 brif v15, block2, block3
;;
;; block2:
-;; v58 = iconst.i32 32
+;; @0020 v58 = iconst.i32 32
;; v56 = iadd.i32 v5, v58 ; v58 = 32
;; @0020 store notrap aligned region3 v56, v4
-;; v59 = iconst.i32 -1342177278
-;; v60 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v61 = load.i64 notrap aligned readonly can_move region7 v60+32
+;; @0020 v59 = iconst.i32 -1342177278
+;; @0020 v60 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @0020 v61 = load.i64 notrap aligned readonly can_move region7 v60+32
;; @0020 v29 = iadd v61, v12
;; @0020 store user2 region8 v59, v29 ; v59 = -1342177278
-;; v62 = load.i64 notrap aligned readonly can_move region5 v0+40
-;; v63 = load.i32 notrap aligned readonly can_move region6 v62
+;; @0020 v62 = load.i64 notrap aligned readonly can_move region5 v0+40
+;; @0020 v63 = load.i32 notrap aligned readonly can_move region6 v62
;; @0020 store user2 region9 v63, v29+4
;; v64 = iconst.i64 32
;; @0020 istore32 user2 region10 v64, v29+8 ; v64 = 32
diff --git a/tests/disas/gc/copying/ref-cast.wat b/tests/disas/gc/copying/ref-cast.wat
index 7bbee7f659..3dda8ceddf 100644
--- a/tests/disas/gc/copying/ref-cast.wat
+++ b/tests/disas/gc/copying/ref-cast.wat
@@ -29,7 +29,7 @@
;; block2:
;; @001e v7 = iconst.i32 1
;; @001e v8 = band.i32 v2, v7 ; v7 = 1
-;; v34 = iconst.i32 0
+;; @001e v34 = iconst.i32 0
;; @001e brif v8, block4(v34), block3 ; v34 = 0
;;
;; block3:
@@ -41,7 +41,7 @@
;; @001e v17 = iconst.i32 -1342177280
;; @001e v18 = band v16, v17 ; v17 = -1342177280
;; @001e v19 = icmp eq v18, v17 ; v17 = -1342177280
-;; v35 = iconst.i32 0
+;; @001e v35 = iconst.i32 0
;; @001e brif v19, block5, block4(v35) ; v35 = 0
;;
;; block5:
diff --git a/tests/disas/gc/copying/ref-test-array.wat b/tests/disas/gc/copying/ref-test-array.wat
index 2f211e4460..84c47a4951 100644
--- a/tests/disas/gc/copying/ref-test-array.wat
+++ b/tests/disas/gc/copying/ref-test-array.wat
@@ -25,7 +25,7 @@
;; block2:
;; @001b v7 = iconst.i32 1
;; @001b v8 = band.i32 v2, v7 ; v7 = 1
-;; v22 = iconst.i32 0
+;; @001b v22 = iconst.i32 0
;; @001b brif v8, block4(v22), block3 ; v22 = 0
;;
;; block3:
diff --git a/tests/disas/gc/copying/ref-test-concrete-type.wat b/tests/disas/gc/copying/ref-test-concrete-type.wat
index 4638540604..020ba1a62c 100644
--- a/tests/disas/gc/copying/ref-test-concrete-type.wat
+++ b/tests/disas/gc/copying/ref-test-concrete-type.wat
@@ -29,7 +29,7 @@
;; block2:
;; @001d v7 = iconst.i32 1
;; @001d v8 = band.i32 v2, v7 ; v7 = 1
-;; v34 = iconst.i32 0
+;; @001d v34 = iconst.i32 0
;; @001d brif v8, block4(v34), block3 ; v34 = 0
;;
;; block3:
@@ -41,7 +41,7 @@
;; @001d v17 = iconst.i32 -1342177280
;; @001d v18 = band v16, v17 ; v17 = -1342177280
;; @001d v19 = icmp eq v18, v17 ; v17 = -1342177280
-;; v35 = iconst.i32 0
+;; @001d v35 = iconst.i32 0
;; @001d brif v19, block5, block4(v35) ; v35 = 0
;;
;; block5:
diff --git a/tests/disas/gc/copying/ref-test-struct.wat b/tests/disas/gc/copying/ref-test-struct.wat
index d8083969a3..7d4dbfbc6f 100644
--- a/tests/disas/gc/copying/ref-test-struct.wat
+++ b/tests/disas/gc/copying/ref-test-struct.wat
@@ -25,7 +25,7 @@
;; block2:
;; @001b v7 = iconst.i32 1
;; @001b v8 = band.i32 v2, v7 ; v7 = 1
-;; v22 = iconst.i32 0
+;; @001b v22 = iconst.i32 0
;; @001b brif v8, block4(v22), block3 ; v22 = 0
;;
;; block3:
diff --git a/tests/disas/gc/copying/struct-new-default.wat b/tests/disas/gc/copying/struct-new-default.wat
index bd5574a9ac..f98f85bb30 100644
--- a/tests/disas/gc/copying/struct-new-default.wat
+++ b/tests/disas/gc/copying/struct-new-default.wat
@@ -44,16 +44,16 @@
;; @0021 brif v17, block2, block3
;;
;; block2:
-;; v59 = iconst.i32 32
+;; @0021 v59 = iconst.i32 32
;; v57 = iadd.i32 v7, v59 ; v59 = 32
;; @0021 store notrap aligned region3 v57, v6
-;; v60 = iconst.i32 -1342177246
-;; v61 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v62 = load.i64 notrap aligned readonly can_move region7 v61+32
+;; @0021 v60 = iconst.i32 -1342177246
+;; @0021 v61 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @0021 v62 = load.i64 notrap aligned readonly can_move region7 v61+32
;; @0021 v31 = iadd v62, v14
;; @0021 store user2 region8 v60, v31 ; v60 = -1342177246
-;; v63 = load.i64 notrap aligned readonly can_move region5 v0+40
-;; v64 = load.i32 notrap aligned readonly can_move region6 v63
+;; @0021 v63 = load.i64 notrap aligned readonly can_move region5 v0+40
+;; @0021 v64 = load.i32 notrap aligned readonly can_move region6 v63
;; @0021 store user2 region9 v64, v31+4
;; v65 = iconst.i64 32
;; @0021 istore32 user2 region10 v65, v31+8 ; v65 = 32
diff --git a/tests/disas/gc/copying/struct-new.wat b/tests/disas/gc/copying/struct-new.wat
index 3848722294..b3f67dd1ee 100644
--- a/tests/disas/gc/copying/struct-new.wat
+++ b/tests/disas/gc/copying/struct-new.wat
@@ -48,16 +48,16 @@
;; @002a brif v17, block2, block3
;;
;; block2:
-;; v62 = iconst.i32 32
+;; @002a v62 = iconst.i32 32
;; v60 = iadd.i32 v7, v62 ; v62 = 32
;; @002a store notrap aligned region3 v60, v6
-;; v63 = iconst.i32 -1342177246
-;; v64 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v65 = load.i64 notrap aligned readonly can_move region7 v64+32
+;; @002a v63 = iconst.i32 -1342177246
+;; @002a v64 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @002a v65 = load.i64 notrap aligned readonly can_move region7 v64+32
;; @002a v31 = iadd v65, v14
;; @002a store user2 region8 v63, v31 ; v63 = -1342177246
-;; v66 = load.i64 notrap aligned readonly can_move region5 v0+40
-;; v67 = load.i32 notrap aligned readonly can_move region6 v66
+;; @002a v66 = load.i64 notrap aligned readonly can_move region5 v0+40
+;; @002a v67 = load.i32 notrap aligned readonly can_move region6 v66
;; @002a store user2 region9 v67, v31+4
;; v68 = iconst.i64 32
;; @002a istore32 user2 region10 v68, v31+8 ; v68 = 32
diff --git a/tests/disas/gc/drc/alias-region-header.wat b/tests/disas/gc/drc/alias-region-header.wat
index 8d092eb7e7..991f53b9fa 100644
--- a/tests/disas/gc/drc/alias-region-header.wat
+++ b/tests/disas/gc/drc/alias-region-header.wat
@@ -74,12 +74,12 @@
;; @002f jump block3
;;
;; block3:
-;; v159 = iadd.i64 v8, v9 ; v9 = 24
+;; @002f v159 = iadd.i64 v8, v9 ; v9 = 24
;; @002f store.i32 user2 little region4 v4, v159
-;; v160 = iconst.i32 1
-;; v161 = band.i32 v11, v160 ; v160 = 1
-;; v162 = iconst.i32 0
-;; v163 = icmp.i32 eq v11, v162 ; v162 = 0
+;; @002f v160 = iconst.i32 1
+;; @002f v161 = band.i32 v11, v160 ; v160 = 1
+;; @002f v162 = iconst.i32 0
+;; @002f v163 = icmp.i32 eq v11, v162 ; v162 = 0
;; @002f v37 = uextend.i32 v163
;; @002f v38 = bor v161, v37
;; @002f brif v38, block7, block4
@@ -87,10 +87,10 @@
;; block4:
;; @002f v39 = uextend.i64 v11
;; @002f v42 = iadd.i64 v7, v39
-;; v164 = iconst.i64 8
+;; @002f v164 = iconst.i64 8
;; @002f v44 = iadd v42, v164 ; v164 = 8
;; @002f v45 = load.i64 user2 region5 v44
-;; v165 = iconst.i64 1
+;; @002f v165 = iconst.i64 1
;; v157 = icmp eq v45, v165 ; v165 = 1
;; @002f brif v157, block5, block6
;;
@@ -101,7 +101,7 @@
;; block6:
;; @002f v46 = iconst.i64 -1
;; @002f v47 = iadd.i64 v45, v46 ; v46 = -1
-;; v166 = iadd.i64 v42, v164 ; v164 = 8
+;; @002f v166 = iadd.i64 v42, v164 ; v164 = 8
;; @002f store user2 region5 v47, v166
;; @002f jump block7
;;
@@ -110,14 +110,14 @@
;; @0035 trapz v140, user16
;; @0035 v58 = uextend.i64 v140
;; @0035 v61 = iadd.i64 v7, v58
-;; v167 = iconst.i64 24
-;; v168 = iadd v61, v167 ; v167 = 24
+;; @002f v167 = iconst.i64 24
+;; @0035 v168 = iadd v61, v167 ; v167 = 24
;; @0035 v64 = load.i32 user2 little region4 v168
;; store notrap aligned region12 v64, v145
-;; v169 = iconst.i32 1
-;; v170 = band v64, v169 ; v169 = 1
-;; v171 = iconst.i32 0
-;; v172 = icmp eq v64, v171 ; v171 = 0
+;; @002f v169 = iconst.i32 1
+;; @0035 v170 = band v64, v169 ; v169 = 1
+;; @002f v171 = iconst.i32 0
+;; @0035 v172 = icmp eq v64, v171 ; v171 = 0
;; @0035 v69 = uextend.i32 v172
;; @0035 v70 = bor v170, v69
;; @0035 brif v70, block10, block8
@@ -136,19 +136,19 @@
;; @0035 v84 = iconst.i64 16
;; @0035 v85 = iadd.i64 v74, v84 ; v84 = 16
;; @0035 store user2 region9 v79, v85
-;; v173 = iconst.i32 2
-;; v174 = bor.i32 v75, v173 ; v173 = 2
+;; @0035 v173 = iconst.i32 2
+;; @0035 v174 = bor.i32 v75, v173 ; v173 = 2
;; @0035 store user2 region6 v174, v74
-;; v175 = iconst.i64 8
+;; @002f v175 = iconst.i64 8
;; @0035 v97 = iadd.i64 v74, v175 ; v175 = 8
;; @0035 v98 = load.i64 user2 region5 v97
-;; v176 = iconst.i64 1
+;; @002f v176 = iconst.i64 1
;; @0035 v100 = iadd v98, v176 ; v176 = 1
;; @0035 store user2 region5 v100, v97
;; @0035 store.i32 notrap aligned region8 v64, v78
;; @0035 v107 = load.i32 notrap aligned region10 v78+4
-;; v177 = iconst.i32 1
-;; v178 = iadd v107, v177 ; v177 = 1
+;; @002f v177 = iconst.i32 1
+;; @0035 v178 = iadd v107, v177 ; v177 = 1
;; @0035 store notrap aligned region10 v178, v78+4
;; @0035 v112 = load.i32 notrap aligned region11 v78+8
;; @0035 v113 = iadd v112, v112
diff --git a/tests/disas/gc/drc/array-fill.wat b/tests/disas/gc/drc/array-fill.wat
index c88c30bf35..31231dc301 100644
--- a/tests/disas/gc/drc/array-fill.wat
+++ b/tests/disas/gc/drc/array-fill.wat
@@ -55,8 +55,8 @@
;;
;; block2(v43: i64):
;; @0027 store.i64 user2 little region5 v4, v43
-;; v57 = iconst.i64 8
-;; v58 = iadd v43, v57 ; v57 = 8
+;; @0027 v57 = iconst.i64 8
+;; @0027 v58 = iadd v43, v57 ; v57 = 8
;; @0027 v46 = icmp eq v58, v40
;; @0027 brif v46, block3, block2(v58)
;;
diff --git a/tests/disas/gc/drc/array-new-fixed-of-gc-refs.wat b/tests/disas/gc/drc/array-new-fixed-of-gc-refs.wat
index faba65d4b1..23ce66d5c6 100644
--- a/tests/disas/gc/drc/array-new-fixed-of-gc-refs.wat
+++ b/tests/disas/gc/drc/array-new-fixed-of-gc-refs.wat
@@ -82,10 +82,10 @@
;; @0025 v52 = isub v49, v206 ; v206 = 12
;; @0025 store.i32 user2 little region7 v201, v52
;; v191 = load.i32 notrap aligned region10 v203
-;; v307 = iconst.i32 1
-;; v308 = band v191, v307 ; v307 = 1
-;; v309 = iconst.i32 0
-;; v310 = icmp eq v191, v309 ; v309 = 0
+;; @0025 v307 = iconst.i32 1
+;; @0025 v308 = band v191, v307 ; v307 = 1
+;; @0025 v309 = iconst.i32 0
+;; @0025 v310 = icmp eq v191, v309 ; v309 = 0
;; @0025 v106 = uextend.i32 v310
;; @0025 v107 = bor v308, v106
;; @0025 brif v107, block5, block4
@@ -93,23 +93,23 @@
;; block4:
;; @0025 v108 = uextend.i64 v191
;; @0025 v111 = iadd.i64 v20, v108
-;; v311 = iconst.i64 8
+;; @0025 v311 = iconst.i64 8
;; @0025 v113 = iadd v111, v311 ; v311 = 8
;; @0025 v114 = load.i64 user2 region8 v113
-;; v312 = iconst.i64 1
+;; @0025 v312 = iconst.i64 1
;; @0025 v116 = iadd v114, v312 ; v312 = 1
;; @0025 store user2 region8 v116, v113
;; @0025 jump block5
;;
;; block5:
-;; v313 = iconst.i64 8
+;; @0025 v313 = iconst.i64 8
;; @0025 v101 = isub.i64 v49, v313 ; v313 = 8
;; @0025 store.i32 user2 little region7 v191, v101
;; v181 = load.i32 notrap aligned region9 v204
-;; v314 = iconst.i32 1
-;; v315 = band v181, v314 ; v314 = 1
-;; v316 = iconst.i32 0
-;; v317 = icmp eq v181, v316 ; v316 = 0
+;; @0025 v314 = iconst.i32 1
+;; @0025 v315 = band v181, v314 ; v314 = 1
+;; @0025 v316 = iconst.i32 0
+;; @0025 v317 = icmp eq v181, v316 ; v316 = 0
;; @0025 v155 = uextend.i32 v317
;; @0025 v156 = bor v315, v155
;; @0025 brif v156, block7, block6
@@ -119,7 +119,7 @@
;; @0025 v160 = iadd.i64 v20, v157
;; @0025 v162 = iadd v160, v313 ; v313 = 8
;; @0025 v163 = load.i64 user2 region8 v162
-;; v318 = iconst.i64 1
+;; @0025 v318 = iconst.i64 1
;; @0025 v165 = iadd v163, v318 ; v318 = 1
;; @0025 store user2 region8 v165, v162
;; @0025 jump block7
diff --git a/tests/disas/gc/drc/array-new.wat b/tests/disas/gc/drc/array-new.wat
index 0f967666db..fc23fa3e9d 100644
--- a/tests/disas/gc/drc/array-new.wat
+++ b/tests/disas/gc/drc/array-new.wat
@@ -63,8 +63,8 @@
;;
;; block2(v61: i64):
;; @0022 store.i64 user2 little region7 v2, v61
-;; v93 = iconst.i64 8
-;; v94 = iadd v61, v93 ; v93 = 8
+;; @0022 v93 = iconst.i64 8
+;; @0022 v94 = iadd v61, v93 ; v93 = 8
;; @0022 v64 = icmp eq v94, v58
;; @0022 brif v64, block3, block2(v94)
;;
diff --git a/tests/disas/gc/drc/br-on-cast-fail.wat b/tests/disas/gc/drc/br-on-cast-fail.wat
index 277a006153..bb8d47627d 100644
--- a/tests/disas/gc/drc/br-on-cast-fail.wat
+++ b/tests/disas/gc/drc/br-on-cast-fail.wat
@@ -41,7 +41,7 @@
;; block3:
;; @002e v7 = iconst.i32 1
;; @002e v8 = band.i32 v2, v7 ; v7 = 1
-;; v38 = iconst.i32 0
+;; @002e v38 = iconst.i32 0
;; @002e brif v8, block5(v38), block4 ; v38 = 0
;;
;; block4:
@@ -53,7 +53,7 @@
;; @002e v17 = iconst.i32 -1342177280
;; @002e v18 = band v16, v17 ; v17 = -1342177280
;; @002e v19 = icmp eq v18, v17 ; v17 = -1342177280
-;; v39 = iconst.i32 0
+;; @002e v39 = iconst.i32 0
;; @002e brif v19, block6, block5(v39) ; v39 = 0
;;
;; block6:
diff --git a/tests/disas/gc/drc/br-on-cast.wat b/tests/disas/gc/drc/br-on-cast.wat
index 6cbe84deee..f91fe56980 100644
--- a/tests/disas/gc/drc/br-on-cast.wat
+++ b/tests/disas/gc/drc/br-on-cast.wat
@@ -41,7 +41,7 @@
;; block3:
;; @002f v7 = iconst.i32 1
;; @002f v8 = band.i32 v2, v7 ; v7 = 1
-;; v38 = iconst.i32 0
+;; @002f v38 = iconst.i32 0
;; @002f brif v8, block5(v38), block4 ; v38 = 0
;;
;; block4:
@@ -53,7 +53,7 @@
;; @002f v17 = iconst.i32 -1342177280
;; @002f v18 = band v16, v17 ; v17 = -1342177280
;; @002f v19 = icmp eq v18, v17 ; v17 = -1342177280
-;; v39 = iconst.i32 0
+;; @002f v39 = iconst.i32 0
;; @002f brif v19, block6, block5(v39) ; v39 = 0
;;
;; block6:
diff --git a/tests/disas/gc/drc/externref-globals.wat b/tests/disas/gc/drc/externref-globals.wat
index 7690c77cd2..c5c5cb992c 100644
--- a/tests/disas/gc/drc/externref-globals.wat
+++ b/tests/disas/gc/drc/externref-globals.wat
@@ -64,8 +64,8 @@
;; @0034 v24 = iconst.i64 16
;; @0034 v25 = iadd.i64 v14, v24 ; v24 = 16
;; @0034 store user2 region8 v19, v25
-;; v77 = iconst.i32 2
-;; v78 = bor.i32 v15, v77 ; v77 = 2
+;; @0034 v77 = iconst.i32 2
+;; @0034 v78 = bor.i32 v15, v77 ; v77 = 2
;; @0034 store user2 region5 v78, v14
;; @0034 v36 = iconst.i64 8
;; @0034 v37 = iadd.i64 v14, v36 ; v36 = 8
@@ -75,8 +75,8 @@
;; @0034 store user2 region9 v40, v37
;; @0034 store.i32 notrap aligned region7 v4, v18
;; @0034 v47 = load.i32 notrap aligned region10 v18+4
-;; v79 = iconst.i32 1
-;; v80 = iadd v47, v79 ; v79 = 1
+;; @0034 v79 = iconst.i32 1
+;; @0034 v80 = iadd v47, v79 ; v79 = 1
;; @0034 store notrap aligned region10 v80, v18+4
;; @0034 v52 = load.i32 notrap aligned region11 v18+8
;; @0034 v53 = iadd v52, v52
@@ -140,25 +140,25 @@
;; @003b jump block3
;;
;; block3:
-;; v63 = iadd.i64 v0, v3 ; v3 = 48
+;; @003b v63 = iadd.i64 v0, v3 ; v3 = 48
;; @003b store.i32 notrap aligned region2 v2, v63
-;; v64 = iconst.i32 1
-;; v65 = band.i32 v5, v64 ; v64 = 1
-;; v66 = iconst.i32 0
-;; v67 = icmp.i32 eq v5, v66 ; v66 = 0
+;; @003b v64 = iconst.i32 1
+;; @003b v65 = band.i32 v5, v64 ; v64 = 1
+;; @003b v66 = iconst.i32 0
+;; @003b v67 = icmp.i32 eq v5, v66 ; v66 = 0
;; @003b v31 = uextend.i32 v67
;; @003b v32 = bor v65, v31
;; @003b brif v32, block7, block4
;;
;; block4:
-;; v68 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v69 = load.i64 notrap aligned readonly can_move region3 v68+32
+;; @003b v68 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @003b v69 = load.i64 notrap aligned readonly can_move region3 v68+32
;; @003b v33 = uextend.i64 v5
;; @003b v36 = iadd v69, v33
-;; v70 = iconst.i64 8
+;; @003b v70 = iconst.i64 8
;; @003b v38 = iadd v36, v70 ; v70 = 8
;; @003b v39 = load.i64 user2 region5 v38
-;; v71 = iconst.i64 1
+;; @003b v71 = iconst.i64 1
;; v61 = icmp eq v39, v71 ; v71 = 1
;; @003b brif v61, block5, block6
;;
@@ -169,7 +169,7 @@
;; block6:
;; @003b v40 = iconst.i64 -1
;; @003b v41 = iadd.i64 v39, v40 ; v40 = -1
-;; v72 = iadd.i64 v36, v70 ; v70 = 8
+;; @003b v72 = iadd.i64 v36, v70 ; v70 = 8
;; @003b store user2 region5 v41, v72
;; @003b jump block7
;;
diff --git a/tests/disas/gc/drc/ref-cast.wat b/tests/disas/gc/drc/ref-cast.wat
index b2de063e53..5a2808b90a 100644
--- a/tests/disas/gc/drc/ref-cast.wat
+++ b/tests/disas/gc/drc/ref-cast.wat
@@ -30,7 +30,7 @@
;; block2:
;; @001e v7 = iconst.i32 1
;; @001e v8 = band.i32 v2, v7 ; v7 = 1
-;; v34 = iconst.i32 0
+;; @001e v34 = iconst.i32 0
;; @001e brif v8, block4(v34), block3 ; v34 = 0
;;
;; block3:
@@ -42,7 +42,7 @@
;; @001e v17 = iconst.i32 -1342177280
;; @001e v18 = band v16, v17 ; v17 = -1342177280
;; @001e v19 = icmp eq v18, v17 ; v17 = -1342177280
-;; v35 = iconst.i32 0
+;; @001e v35 = iconst.i32 0
;; @001e brif v19, block5, block4(v35) ; v35 = 0
;;
;; block5:
diff --git a/tests/disas/gc/drc/ref-test-array.wat b/tests/disas/gc/drc/ref-test-array.wat
index e61bb2ebb2..0f158ec586 100644
--- a/tests/disas/gc/drc/ref-test-array.wat
+++ b/tests/disas/gc/drc/ref-test-array.wat
@@ -26,7 +26,7 @@
;; block2:
;; @001b v7 = iconst.i32 1
;; @001b v8 = band.i32 v2, v7 ; v7 = 1
-;; v22 = iconst.i32 0
+;; @001b v22 = iconst.i32 0
;; @001b brif v8, block4(v22), block3 ; v22 = 0
;;
;; block3:
diff --git a/tests/disas/gc/drc/ref-test-concrete-type.wat b/tests/disas/gc/drc/ref-test-concrete-type.wat
index 76dabbebd6..7a29d22f33 100644
--- a/tests/disas/gc/drc/ref-test-concrete-type.wat
+++ b/tests/disas/gc/drc/ref-test-concrete-type.wat
@@ -30,7 +30,7 @@
;; block2:
;; @001d v7 = iconst.i32 1
;; @001d v8 = band.i32 v2, v7 ; v7 = 1
-;; v34 = iconst.i32 0
+;; @001d v34 = iconst.i32 0
;; @001d brif v8, block4(v34), block3 ; v34 = 0
;;
;; block3:
@@ -42,7 +42,7 @@
;; @001d v17 = iconst.i32 -1342177280
;; @001d v18 = band v16, v17 ; v17 = -1342177280
;; @001d v19 = icmp eq v18, v17 ; v17 = -1342177280
-;; v35 = iconst.i32 0
+;; @001d v35 = iconst.i32 0
;; @001d brif v19, block5, block4(v35) ; v35 = 0
;;
;; block5:
diff --git a/tests/disas/gc/drc/ref-test-struct.wat b/tests/disas/gc/drc/ref-test-struct.wat
index 5c670ce475..377a2644cc 100644
--- a/tests/disas/gc/drc/ref-test-struct.wat
+++ b/tests/disas/gc/drc/ref-test-struct.wat
@@ -26,7 +26,7 @@
;; block2:
;; @001b v7 = iconst.i32 1
;; @001b v8 = band.i32 v2, v7 ; v7 = 1
-;; v22 = iconst.i32 0
+;; @001b v22 = iconst.i32 0
;; @001b brif v8, block4(v22), block3 ; v22 = 0
;;
;; block3:
diff --git a/tests/disas/gc/drc/struct-get.wat b/tests/disas/gc/drc/struct-get.wat
index b370a29f96..28bf1bf7ce 100644
--- a/tests/disas/gc/drc/struct-get.wat
+++ b/tests/disas/gc/drc/struct-get.wat
@@ -158,8 +158,8 @@
;; @004e v29 = iconst.i64 16
;; @004e v30 = iadd.i64 v19, v29 ; v29 = 16
;; @004e store user2 region8 v24, v30
-;; v82 = iconst.i32 2
-;; v83 = bor.i32 v20, v82 ; v82 = 2
+;; @004e v82 = iconst.i32 2
+;; @004e v83 = bor.i32 v20, v82 ; v82 = 2
;; @004e store user2 region5 v83, v19
;; @004e v41 = iconst.i64 8
;; @004e v42 = iadd.i64 v19, v41 ; v41 = 8
@@ -169,8 +169,8 @@
;; @004e store user2 region9 v45, v42
;; @004e store.i32 notrap aligned region7 v9, v23
;; @004e v52 = load.i32 notrap aligned region10 v23+4
-;; v84 = iconst.i32 1
-;; v85 = iadd v52, v84 ; v84 = 1
+;; @004e v84 = iconst.i32 1
+;; @004e v85 = iadd v52, v84 ; v84 = 1
;; @004e store notrap aligned region10 v85, v23+4
;; @004e v57 = load.i32 notrap aligned region11 v23+8
;; @004e v58 = iadd v57, v57
diff --git a/tests/disas/gc/drc/struct-new-default.wat b/tests/disas/gc/drc/struct-new-default.wat
index fbf9c48e17..6324247da2 100644
--- a/tests/disas/gc/drc/struct-new-default.wat
+++ b/tests/disas/gc/drc/struct-new-default.wat
@@ -51,7 +51,7 @@
;; @0021 jump block3
;;
;; block3:
-;; v59 = iconst.i32 0
+;; @0021 v59 = iconst.i32 0
;; @0021 v19 = iconst.i64 32
;; @0021 v20 = iadd.i64 v14, v19 ; v19 = 32
;; @0021 store user2 little region7 v59, v20 ; v59 = 0
diff --git a/tests/disas/gc/drc/struct-set.wat b/tests/disas/gc/drc/struct-set.wat
index f1ccea98c2..072a43a526 100644
--- a/tests/disas/gc/drc/struct-set.wat
+++ b/tests/disas/gc/drc/struct-set.wat
@@ -114,12 +114,12 @@
;; @004a jump block3
;;
;; block3:
-;; v68 = iadd.i64 v7, v8 ; v8 = 32
+;; @004a v68 = iadd.i64 v7, v8 ; v8 = 32
;; @004a store.i32 user2 little region4 v3, v68
-;; v69 = iconst.i32 1
-;; v70 = band.i32 v10, v69 ; v69 = 1
-;; v71 = iconst.i32 0
-;; v72 = icmp.i32 eq v10, v71 ; v71 = 0
+;; @004a v69 = iconst.i32 1
+;; @004a v70 = band.i32 v10, v69 ; v69 = 1
+;; @004a v71 = iconst.i32 0
+;; @004a v72 = icmp.i32 eq v10, v71 ; v71 = 0
;; @004a v36 = uextend.i32 v72
;; @004a v37 = bor v70, v36
;; @004a brif v37, block7, block4
@@ -127,10 +127,10 @@
;; block4:
;; @004a v38 = uextend.i64 v10
;; @004a v41 = iadd.i64 v6, v38
-;; v73 = iconst.i64 8
+;; @004a v73 = iconst.i64 8
;; @004a v43 = iadd v41, v73 ; v73 = 8
;; @004a v44 = load.i64 user2 region5 v43
-;; v74 = iconst.i64 1
+;; @004a v74 = iconst.i64 1
;; v66 = icmp eq v44, v74 ; v74 = 1
;; @004a brif v66, block5, block6
;;
@@ -141,7 +141,7 @@
;; block6:
;; @004a v45 = iconst.i64 -1
;; @004a v46 = iadd.i64 v44, v45 ; v45 = -1
-;; v75 = iadd.i64 v41, v73 ; v73 = 8
+;; @004a v75 = iadd.i64 v41, v73 ; v73 = 8
;; @004a store user2 region5 v46, v75
;; @004a jump block7
;;
diff --git a/tests/disas/gc/issue-14452.wat b/tests/disas/gc/issue-14452.wat
index 369482cfc6..7cb8d00771 100644
--- a/tests/disas/gc/issue-14452.wat
+++ b/tests/disas/gc/issue-14452.wat
@@ -70,16 +70,16 @@
;; @0043 brif v15, block2, block3
;;
;; block2:
-;; v104 = iconst.i32 32
+;; @0043 v104 = iconst.i32 32
;; v102 = iadd.i32 v5, v104 ; v104 = 32
;; @0043 store notrap aligned region3 v102, v4
-;; v105 = iconst.i32 -1342177278
-;; v106 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v107 = load.i64 notrap aligned readonly can_move region7 v106+32
+;; @0043 v105 = iconst.i32 -1342177278
+;; @0043 v106 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @0043 v107 = load.i64 notrap aligned readonly can_move region7 v106+32
;; @0043 v29 = iadd v107, v12
;; @0043 store user2 region8 v105, v29 ; v105 = -1342177278
-;; v108 = load.i64 notrap aligned readonly can_move region5 v0+40
-;; v109 = load.i32 notrap aligned readonly can_move region6 v108
+;; @0043 v108 = load.i64 notrap aligned readonly can_move region5 v0+40
+;; @0043 v109 = load.i32 notrap aligned readonly can_move region6 v108
;; @0043 store user2 region9 v109, v29+4
;; v110 = iconst.i64 32
;; @0043 istore32 user2 region10 v110, v29+8 ; v110 = 32
diff --git a/tests/disas/gc/null/alias-region-header.wat b/tests/disas/gc/null/alias-region-header.wat
index 95948cdba6..2631b9f8a1 100644
--- a/tests/disas/gc/null/alias-region-header.wat
+++ b/tests/disas/gc/null/alias-region-header.wat
@@ -67,8 +67,8 @@
;; block2:
;; v107 = iconst.i32 -1342177264
;; @002d v24 = load.i64 notrap aligned readonly can_move region5 v18+32
-;; v113 = band.i32 v13, v106 ; v106 = -8
-;; v114 = uextend.i64 v113
+;; @002d v113 = band.i32 v13, v106 ; v106 = -8
+;; @002d v114 = uextend.i64 v113
;; @002d v26 = iadd v24, v114
;; @002d store user2 region8 v107, v26 ; v107 = -1342177264
;; @002d v29 = load.i64 notrap aligned readonly can_move region6 v0+40
@@ -97,8 +97,8 @@
;; @002d jump block2
;;
;; block4:
-;; v115 = iconst.i32 1
-;; v116 = band.i32 v87, v115 ; v115 = 1
+;; @002b v115 = iconst.i32 1
+;; @003a v116 = band.i32 v87, v115 ; v115 = 1
;; v117 = iconst.i32 0
;; @003a brif v116, block6(v117), block5 ; v117 = 0
;;
@@ -124,6 +124,6 @@
;; @003d jump block1
;;
;; block1:
-;; v119 = iconst.i32 1
+;; @002b v119 = iconst.i32 1
;; @003d return v119, v47, v79 ; v119 = 1
;; }
diff --git a/tests/disas/gc/null/array-fill.wat b/tests/disas/gc/null/array-fill.wat
index 159d51ff5f..b299006c87 100644
--- a/tests/disas/gc/null/array-fill.wat
+++ b/tests/disas/gc/null/array-fill.wat
@@ -54,8 +54,8 @@
;;
;; block2(v43: i64):
;; @0027 store.i64 user2 little region5 v4, v43
-;; v57 = iconst.i64 8
-;; v58 = iadd v43, v57 ; v57 = 8
+;; @0027 v57 = iconst.i64 8
+;; @0027 v58 = iadd v43, v57 ; v57 = 8
;; @0027 v46 = icmp eq v58, v40
;; @0027 brif v46, block3, block2(v58)
;;
diff --git a/tests/disas/gc/null/array-new-fixed-of-gc-refs.wat b/tests/disas/gc/null/array-new-fixed-of-gc-refs.wat
index 85942eef7f..baf9f91b87 100644
--- a/tests/disas/gc/null/array-new-fixed-of-gc-refs.wat
+++ b/tests/disas/gc/null/array-new-fixed-of-gc-refs.wat
@@ -59,8 +59,8 @@
;; block2:
;; v158 = iconst.i32 -1476394984
;; @0025 v32 = load.i64 notrap aligned readonly can_move region5 v26+32
-;; v253 = band.i32 v21, v157 ; v157 = -8
-;; v254 = uextend.i64 v253
+;; @0025 v253 = band.i32 v21, v157 ; v157 = -8
+;; @0025 v254 = uextend.i64 v253
;; @0025 v34 = iadd v32, v254
;; @0025 store user2 region8 v158, v34 ; v158 = -1476394984
;; @0025 v37 = load.i64 notrap aligned readonly can_move region6 v0+40
@@ -95,6 +95,6 @@
;; @0025 jump block2
;;
;; block1:
-;; v256 = band.i32 v21, v157 ; v157 = -8
+;; @0025 v256 = band.i32 v21, v157 ; v157 = -8
;; @0029 return v256
;; }
diff --git a/tests/disas/gc/null/array-new-fixed.wat b/tests/disas/gc/null/array-new-fixed.wat
index b365197a4e..bf1a5113e1 100644
--- a/tests/disas/gc/null/array-new-fixed.wat
+++ b/tests/disas/gc/null/array-new-fixed.wat
@@ -47,8 +47,8 @@
;; block2:
;; v149 = iconst.i32 -1476394968
;; @0025 v32 = load.i64 notrap aligned readonly can_move region5 v26+32
-;; v242 = band.i32 v21, v148 ; v148 = -8
-;; v243 = uextend.i64 v242
+;; @0025 v242 = band.i32 v21, v148 ; v148 = -8
+;; @0025 v243 = uextend.i64 v242
;; @0025 v34 = iadd v32, v243
;; @0025 store user2 region8 v149, v34 ; v149 = -1476394968
;; @0025 v37 = load.i64 notrap aligned readonly can_move region6 v0+40
@@ -80,6 +80,6 @@
;; @0025 jump block2
;;
;; block1:
-;; v245 = band.i32 v21, v148 ; v148 = -8
+;; @0025 v245 = band.i32 v21, v148 ; v148 = -8
;; @0029 return v245
;; }
diff --git a/tests/disas/gc/null/array-new.wat b/tests/disas/gc/null/array-new.wat
index 3c26b925aa..ff269a22a7 100644
--- a/tests/disas/gc/null/array-new.wat
+++ b/tests/disas/gc/null/array-new.wat
@@ -60,8 +60,8 @@
;; @0022 v33 = iconst.i32 -1476395008
;; v99 = bor.i32 v11, v33 ; v33 = -1476395008
;; @0022 v30 = load.i64 notrap aligned readonly can_move region5 v24+32
-;; v118 = band.i32 v19, v98 ; v98 = -8
-;; v119 = uextend.i64 v118
+;; @0022 v118 = band.i32 v19, v98 ; v98 = -8
+;; @0022 v119 = uextend.i64 v118
;; @0022 v32 = iadd v30, v119
;; @0022 store user2 region8 v99, v32
;; @0022 v35 = load.i64 notrap aligned readonly can_move region6 v0+40
@@ -86,8 +86,8 @@
;;
;; block4(v77: i64):
;; @0022 store.i64 user2 little region11 v2, v77
-;; v120 = iconst.i64 8
-;; v121 = iadd v77, v120 ; v120 = 8
+;; @0022 v120 = iconst.i64 8
+;; @0022 v121 = iadd v77, v120 ; v120 = 8
;; @0022 v80 = icmp eq v121, v74
;; @0022 brif v80, block5, block4(v121)
;;
@@ -100,6 +100,6 @@
;; @0022 jump block2
;;
;; block1:
-;; v122 = band.i32 v19, v98 ; v98 = -8
+;; @0022 v122 = band.i32 v19, v98 ; v98 = -8
;; @0025 return v122
;; }
diff --git a/tests/disas/gc/null/br-on-cast-fail.wat b/tests/disas/gc/null/br-on-cast-fail.wat
index befb54c6c6..d39f1ef9c0 100644
--- a/tests/disas/gc/null/br-on-cast-fail.wat
+++ b/tests/disas/gc/null/br-on-cast-fail.wat
@@ -41,7 +41,7 @@
;; block3:
;; @002e v7 = iconst.i32 1
;; @002e v8 = band.i32 v2, v7 ; v7 = 1
-;; v38 = iconst.i32 0
+;; @002e v38 = iconst.i32 0
;; @002e brif v8, block5(v38), block4 ; v38 = 0
;;
;; block4:
@@ -53,7 +53,7 @@
;; @002e v17 = iconst.i32 -1342177280
;; @002e v18 = band v16, v17 ; v17 = -1342177280
;; @002e v19 = icmp eq v18, v17 ; v17 = -1342177280
-;; v39 = iconst.i32 0
+;; @002e v39 = iconst.i32 0
;; @002e brif v19, block6, block5(v39) ; v39 = 0
;;
;; block6:
diff --git a/tests/disas/gc/null/br-on-cast.wat b/tests/disas/gc/null/br-on-cast.wat
index 951f8cce4b..f7deb4af01 100644
--- a/tests/disas/gc/null/br-on-cast.wat
+++ b/tests/disas/gc/null/br-on-cast.wat
@@ -41,7 +41,7 @@
;; block3:
;; @002f v7 = iconst.i32 1
;; @002f v8 = band.i32 v2, v7 ; v7 = 1
-;; v38 = iconst.i32 0
+;; @002f v38 = iconst.i32 0
;; @002f brif v8, block5(v38), block4 ; v38 = 0
;;
;; block4:
@@ -53,7 +53,7 @@
;; @002f v17 = iconst.i32 -1342177280
;; @002f v18 = band v16, v17 ; v17 = -1342177280
;; @002f v19 = icmp eq v18, v17 ; v17 = -1342177280
-;; v39 = iconst.i32 0
+;; @002f v39 = iconst.i32 0
;; @002f brif v19, block6, block5(v39) ; v39 = 0
;;
;; block6:
diff --git a/tests/disas/gc/null/funcref-in-gc-heap-new.wat b/tests/disas/gc/null/funcref-in-gc-heap-new.wat
index 3fba86a6d9..16cb468ac5 100644
--- a/tests/disas/gc/null/funcref-in-gc-heap-new.wat
+++ b/tests/disas/gc/null/funcref-in-gc-heap-new.wat
@@ -48,8 +48,8 @@
;; block2:
;; v46 = iconst.i32 -1342177264
;; @0020 v22 = load.i64 notrap aligned readonly can_move region5 v16+32
-;; v52 = band.i32 v11, v45 ; v45 = -8
-;; v53 = uextend.i64 v52
+;; @0020 v52 = band.i32 v11, v45 ; v45 = -8
+;; @0020 v53 = uextend.i64 v52
;; @0020 v24 = iadd v22, v53
;; @0020 store user2 region8 v46, v24 ; v46 = -1342177264
;; @0020 v27 = load.i64 notrap aligned readonly can_move region6 v0+40
@@ -69,6 +69,6 @@
;; @0020 jump block2
;;
;; block1:
-;; v54 = band.i32 v11, v45 ; v45 = -8
+;; @0020 v54 = band.i32 v11, v45 ; v45 = -8
;; @0023 return v54
;; }
diff --git a/tests/disas/gc/null/ref-cast.wat b/tests/disas/gc/null/ref-cast.wat
index dab2054073..e287d4dce6 100644
--- a/tests/disas/gc/null/ref-cast.wat
+++ b/tests/disas/gc/null/ref-cast.wat
@@ -30,7 +30,7 @@
;; block2:
;; @001e v7 = iconst.i32 1
;; @001e v8 = band.i32 v2, v7 ; v7 = 1
-;; v34 = iconst.i32 0
+;; @001e v34 = iconst.i32 0
;; @001e brif v8, block4(v34), block3 ; v34 = 0
;;
;; block3:
@@ -42,7 +42,7 @@
;; @001e v17 = iconst.i32 -1342177280
;; @001e v18 = band v16, v17 ; v17 = -1342177280
;; @001e v19 = icmp eq v18, v17 ; v17 = -1342177280
-;; v35 = iconst.i32 0
+;; @001e v35 = iconst.i32 0
;; @001e brif v19, block5, block4(v35) ; v35 = 0
;;
;; block5:
diff --git a/tests/disas/gc/null/ref-test-array.wat b/tests/disas/gc/null/ref-test-array.wat
index 6581a110cd..ecc0f2b79c 100644
--- a/tests/disas/gc/null/ref-test-array.wat
+++ b/tests/disas/gc/null/ref-test-array.wat
@@ -26,7 +26,7 @@
;; block2:
;; @001b v7 = iconst.i32 1
;; @001b v8 = band.i32 v2, v7 ; v7 = 1
-;; v22 = iconst.i32 0
+;; @001b v22 = iconst.i32 0
;; @001b brif v8, block4(v22), block3 ; v22 = 0
;;
;; block3:
diff --git a/tests/disas/gc/null/ref-test-concrete-type.wat b/tests/disas/gc/null/ref-test-concrete-type.wat
index 22ae83f81e..7cef39bac2 100644
--- a/tests/disas/gc/null/ref-test-concrete-type.wat
+++ b/tests/disas/gc/null/ref-test-concrete-type.wat
@@ -30,7 +30,7 @@
;; block2:
;; @001d v7 = iconst.i32 1
;; @001d v8 = band.i32 v2, v7 ; v7 = 1
-;; v34 = iconst.i32 0
+;; @001d v34 = iconst.i32 0
;; @001d brif v8, block4(v34), block3 ; v34 = 0
;;
;; block3:
@@ -42,7 +42,7 @@
;; @001d v17 = iconst.i32 -1342177280
;; @001d v18 = band v16, v17 ; v17 = -1342177280
;; @001d v19 = icmp eq v18, v17 ; v17 = -1342177280
-;; v35 = iconst.i32 0
+;; @001d v35 = iconst.i32 0
;; @001d brif v19, block5, block4(v35) ; v35 = 0
;;
;; block5:
diff --git a/tests/disas/gc/null/ref-test-struct.wat b/tests/disas/gc/null/ref-test-struct.wat
index 788485b7ec..1a8899afcc 100644
--- a/tests/disas/gc/null/ref-test-struct.wat
+++ b/tests/disas/gc/null/ref-test-struct.wat
@@ -26,7 +26,7 @@
;; block2:
;; @001b v7 = iconst.i32 1
;; @001b v8 = band.i32 v2, v7 ; v7 = 1
-;; v22 = iconst.i32 0
+;; @001b v22 = iconst.i32 0
;; @001b brif v8, block4(v22), block3 ; v22 = 0
;;
;; block3:
diff --git a/tests/disas/gc/null/struct-new-default.wat b/tests/disas/gc/null/struct-new-default.wat
index 975de993f0..c720a7eb43 100644
--- a/tests/disas/gc/null/struct-new-default.wat
+++ b/tests/disas/gc/null/struct-new-default.wat
@@ -50,8 +50,8 @@
;; block2:
;; v49 = iconst.i32 -1342177256
;; @0021 v24 = load.i64 notrap aligned readonly can_move region5 v18+32
-;; v55 = band.i32 v13, v48 ; v48 = -8
-;; v56 = uextend.i64 v55
+;; @0021 v55 = band.i32 v13, v48 ; v48 = -8
+;; @0021 v56 = uextend.i64 v55
;; @0021 v26 = iadd v24, v56
;; @0021 store user2 region8 v49, v26 ; v49 = -1342177256
;; @0021 v29 = load.i64 notrap aligned readonly can_move region6 v0+40
@@ -77,6 +77,6 @@
;; @0021 jump block2
;;
;; block1:
-;; v57 = band.i32 v13, v48 ; v48 = -8
+;; @0021 v57 = band.i32 v13, v48 ; v48 = -8
;; @0024 return v57
;; }
diff --git a/tests/disas/gc/null/struct-new.wat b/tests/disas/gc/null/struct-new.wat
index 7f2485c5b4..54ae17ace6 100644
--- a/tests/disas/gc/null/struct-new.wat
+++ b/tests/disas/gc/null/struct-new.wat
@@ -54,8 +54,8 @@
;; block2:
;; v53 = iconst.i32 -1342177256
;; @002a v24 = load.i64 notrap aligned readonly can_move region5 v18+32
-;; v59 = band.i32 v13, v52 ; v52 = -8
-;; v60 = uextend.i64 v59
+;; @002a v59 = band.i32 v13, v52 ; v52 = -8
+;; @002a v60 = uextend.i64 v59
;; @002a v26 = iadd v24, v60
;; @002a store user2 region8 v53, v26 ; v53 = -1342177256
;; @002a v29 = load.i64 notrap aligned readonly can_move region6 v0+40
@@ -80,6 +80,6 @@
;; @002a jump block2
;;
;; block1:
-;; v61 = band.i32 v13, v52 ; v52 = -8
+;; @002a v61 = band.i32 v13, v52 ; v52 = -8
;; @002d return v61
;; }
diff --git a/tests/disas/gc/ref-test-cast-final-type.wat b/tests/disas/gc/ref-test-cast-final-type.wat
index 94b949a98c..3a1597a305 100644
--- a/tests/disas/gc/ref-test-cast-final-type.wat
+++ b/tests/disas/gc/ref-test-cast-final-type.wat
@@ -36,7 +36,7 @@
;; block2:
;; @0024 v7 = iconst.i32 1
;; @0024 v8 = band.i32 v2, v7 ; v7 = 1
-;; v34 = iconst.i32 0
+;; @0024 v34 = iconst.i32 0
;; @0024 brif v8, block4(v34), block3 ; v34 = 0
;;
;; block3:
@@ -48,7 +48,7 @@
;; @0024 v17 = iconst.i32 -1342177280
;; @0024 v18 = band v16, v17 ; v17 = -1342177280
;; @0024 v19 = icmp eq v18, v17 ; v17 = -1342177280
-;; v35 = iconst.i32 0
+;; @0024 v35 = iconst.i32 0
;; @0024 brif v19, block5, block4(v35) ; v35 = 0
;;
;; block5:
@@ -90,7 +90,7 @@
;; block2:
;; @002c v7 = iconst.i32 1
;; @002c v8 = band.i32 v2, v7 ; v7 = 1
-;; v34 = iconst.i32 0
+;; @002c v34 = iconst.i32 0
;; @002c brif v8, block4(v34), block3 ; v34 = 0
;;
;; block3:
@@ -102,7 +102,7 @@
;; @002c v17 = iconst.i32 -1342177280
;; @002c v18 = band v16, v17 ; v17 = -1342177280
;; @002c v19 = icmp eq v18, v17 ; v17 = -1342177280
-;; v35 = iconst.i32 0
+;; @002c v35 = iconst.i32 0
;; @002c brif v19, block5, block4(v35) ; v35 = 0
;;
;; block5:
diff --git a/tests/disas/gc/struct-new-default.wat b/tests/disas/gc/struct-new-default.wat
index 72d25825a7..0301c84915 100644
--- a/tests/disas/gc/struct-new-default.wat
+++ b/tests/disas/gc/struct-new-default.wat
@@ -48,16 +48,16 @@
;; @0023 brif v18, block2, block3
;;
;; block2:
-;; v62 = iconst.i32 48
+;; @0023 v62 = iconst.i32 48
;; v60 = iadd.i32 v8, v62 ; v62 = 48
;; @0023 store notrap aligned region3 v60, v7
-;; v63 = iconst.i32 -1342177246
-;; v64 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v65 = load.i64 notrap aligned readonly can_move region7 v64+32
+;; @0023 v63 = iconst.i32 -1342177246
+;; @0023 v64 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @0023 v65 = load.i64 notrap aligned readonly can_move region7 v64+32
;; @0023 v32 = iadd v65, v15
;; @0023 store user2 region8 v63, v32 ; v63 = -1342177246
-;; v66 = load.i64 notrap aligned readonly can_move region5 v0+40
-;; v67 = load.i32 notrap aligned readonly can_move region6 v66
+;; @0023 v66 = load.i64 notrap aligned readonly can_move region5 v0+40
+;; @0023 v67 = load.i32 notrap aligned readonly can_move region6 v66
;; @0023 store user2 region9 v67, v32+4
;; v68 = iconst.i64 48
;; @0023 istore32 user2 region10 v68, v32+8 ; v68 = 48
diff --git a/tests/disas/gc/struct-new.wat b/tests/disas/gc/struct-new.wat
index 97b912c089..837f5ef702 100644
--- a/tests/disas/gc/struct-new.wat
+++ b/tests/disas/gc/struct-new.wat
@@ -49,16 +49,16 @@
;; @002a brif v17, block2, block3
;;
;; block2:
-;; v62 = iconst.i32 32
+;; @002a v62 = iconst.i32 32
;; v60 = iadd.i32 v7, v62 ; v62 = 32
;; @002a store notrap aligned region3 v60, v6
-;; v63 = iconst.i32 -1342177246
-;; v64 = load.i64 notrap aligned readonly can_move region0 v0+8
-;; v65 = load.i64 notrap aligned readonly can_move region7 v64+32
+;; @002a v63 = iconst.i32 -1342177246
+;; @002a v64 = load.i64 notrap aligned readonly can_move region0 v0+8
+;; @002a v65 = load.i64 notrap aligned readonly can_move region7 v64+32
;; @002a v31 = iadd v65, v14
;; @002a store user2 region8 v63, v31 ; v63 = -1342177246
-;; v66 = load.i64 notrap aligned readonly can_move region5 v0+40
-;; v67 = load.i32 notrap aligned readonly can_move region6 v66
+;; @002a v66 = load.i64 notrap aligned readonly can_move region5 v0+40
+;; @002a v67 = load.i32 notrap aligned readonly can_move region6 v66
;; @002a store user2 region9 v67, v31+4
;; v68 = iconst.i64 32
;; @002a istore32 user2 region10 v68, v31+8 ; v68 = 32
diff --git a/tests/disas/icall-loop.wat b/tests/disas/icall-loop.wat
index 5c7429093b..d54f6d63bd 100644
--- a/tests/disas/icall-loop.wat
+++ b/tests/disas/icall-loop.wat
@@ -57,12 +57,12 @@
;;
;; block2:
;; @002b v13 = load.i64 user6 aligned region3 v12
-;; v29 = iconst.i64 -2
-;; v30 = band v13, v29 ; v29 = -2
+;; @002b v29 = iconst.i64 -2
+;; @002b v30 = band v13, v29 ; v29 = -2
;; @002b brif v13, block5(v30), block4
;;
;; block4 cold:
-;; v31 = iconst.i32 0
+;; @002b v31 = iconst.i32 0
;; @002b v19 = call fn0(v0, v31, v6) ; v31 = 0
;; @002b jump block5(v19)
;;
@@ -105,14 +105,14 @@
;; @0034 jump block2
;;
;; block2:
-;; v35 = iadd.i64 v6, v34 ; v34 = 8
+;; @0038 v35 = iadd.i64 v6, v34 ; v34 = 8
;; @0038 v12 = load.i64 user6 aligned region3 v35
-;; v36 = iconst.i64 -2
-;; v37 = band v12, v36 ; v36 = -2
+;; @0038 v36 = iconst.i64 -2
+;; @0038 v37 = band v12, v36 ; v36 = -2
;; @0038 brif v12, block5(v37), block4
;;
;; block4 cold:
-;; v38 = iconst.i32 0
+;; @0038 v38 = iconst.i32 0
;; v39 = iconst.i64 1
;; @0038 v18 = call fn0(v0, v38, v39) ; v38 = 0, v39 = 1
;; @0038 jump block5(v18)
diff --git a/tests/disas/memory-copy-fuel-const-len.wat b/tests/disas/memory-copy-fuel-const-len.wat
index edc6dd0e65..0873ad1e0f 100644
--- a/tests/disas/memory-copy-fuel-const-len.wat
+++ b/tests/disas/memory-copy-fuel-const-len.wat
@@ -38,7 +38,7 @@
;; @0023 brif v9, block2, block3(v7)
;;
;; block2:
-;; v58 = iadd.i64 v5, v6 ; v6 = 1
+;; @0023 v58 = iadd.i64 v5, v6 ; v6 = 1
;; @0023 store notrap aligned region2 v58, v4
;; @0023 v11 = call fn0(v0)
;; @0023 v13 = load.i64 notrap aligned region2 v4
@@ -94,7 +94,7 @@
;; @0030 brif v8, block2, block3(v6)
;;
;; block2:
-;; v43 = iadd.i64 v4, v5 ; v5 = 1
+;; @0030 v43 = iadd.i64 v4, v5 ; v5 = 1
;; @0030 store notrap aligned region2 v43, v3
;; @0030 v10 = call fn0(v0)
;; @0030 v12 = load.i64 notrap aligned region2 v3
@@ -145,7 +145,7 @@
;; @003d brif v8, block2, block3(v6)
;;
;; block2:
-;; v50 = iadd.i64 v4, v5 ; v5 = 1
+;; @003d v50 = iadd.i64 v4, v5 ; v5 = 1
;; @003d store notrap aligned region2 v50, v3
;; @003d v10 = call fn0(v0)
;; @003d v12 = load.i64 notrap aligned region2 v3
@@ -164,12 +164,12 @@
;; @0045 call fn1(v0, v27, v14, v40) ; v14 = 0, v40 = 4096
;; @0045 v30 = iconst.i64 4100
;; @0045 v31 = iadd v29, v30 ; v30 = 4100
-;; v51 = iconst.i64 0
-;; v52 = icmp sge v31, v51 ; v51 = 0
+;; @003d v51 = iconst.i64 0
+;; @0045 v52 = icmp sge v31, v51 ; v51 = 0
;; @0045 brif v52, block4, block5(v31)
;;
;; block4:
-;; v53 = iadd.i64 v29, v30 ; v30 = 4100
+;; @0045 v53 = iadd.i64 v29, v30 ; v30 = 4100
;; @0045 store notrap aligned region2 v53, v3
;; @0045 v35 = call fn0(v0)
;; @0045 v37 = load.i64 notrap aligned region2 v3
diff --git a/tests/disas/memory-copy-fuel.wat b/tests/disas/memory-copy-fuel.wat
index 9eb922fa97..596af48985 100644
--- a/tests/disas/memory-copy-fuel.wat
+++ b/tests/disas/memory-copy-fuel.wat
@@ -33,7 +33,7 @@
;; @001e brif v10, block2, block3(v8)
;;
;; block2:
-;; v61 = iadd.i64 v6, v7 ; v7 = 1
+;; @001e v61 = iadd.i64 v6, v7 ; v7 = 1
;; @001e store notrap aligned region2 v61, v5
;; @001e v12 = call fn0(v0)
;; @001e v14 = load.i64 notrap aligned region2 v5
@@ -57,8 +57,8 @@
;; @0025 v44 = iconst.i64 4
;; @0025 v45 = iadd v43, v44 ; v44 = 4
;; @0025 v49 = iadd v45, v20
-;; v62 = iconst.i64 0
-;; v63 = icmp sge v49, v62 ; v62 = 0
+;; @001e v62 = iconst.i64 0
+;; @0025 v63 = icmp sge v49, v62 ; v62 = 0
;; @0025 brif v63, block4, block5(v49)
;;
;; block4:
diff --git a/tests/disas/memory-min-max-same.wat b/tests/disas/memory-min-max-same.wat
index d9fe386559..47e3f42bc2 100644
--- a/tests/disas/memory-min-max-same.wat
+++ b/tests/disas/memory-min-max-same.wat
@@ -59,16 +59,16 @@
;;
;; block2(v8: i32):
;; @0030 call_indirect.i64 sig0, v6(v5, v0)
-;; v20 = iconst.i32 0
+;; @0028 v20 = iconst.i32 0
;; @0036 v9 = iadd.i32 v2, v8
;; @0039 v11 = uextend.i64 v9
-;; v21 = iconst.i64 0x0001_0000
-;; v22 = icmp ugt v11, v21 ; v21 = 0x0001_0000
+;; @0039 v21 = iconst.i64 0x0001_0000
+;; @0039 v22 = icmp ugt v11, v21 ; v21 = 0x0001_0000
;; @0039 v15 = iadd.i64 v14, v11
-;; v23 = iconst.i64 0
-;; v24 = select_spectre_guard v22, v23, v15 ; v23 = 0
+;; @0039 v23 = iconst.i64 0
+;; @0039 v24 = select_spectre_guard v22, v23, v15 ; v23 = 0
;; @0039 store little region6 v20, v24 ; v20 = 0
-;; v25 = iconst.i32 1
-;; v26 = iadd v8, v25 ; v25 = 1
+;; @003e v25 = iconst.i32 1
+;; @0040 v26 = iadd v8, v25 ; v25 = 1
;; @0043 jump block2(v26)
;; }
diff --git a/tests/disas/memory-watchpoints.wat b/tests/disas/memory-watchpoints.wat
index 033d850d16..ac0a08ae20 100644
--- a/tests/disas/memory-watchpoints.wat
+++ b/tests/disas/memory-watchpoints.wat
@@ -63,7 +63,7 @@
;; @0022 brif v18, block4, block5
;;
;; block4 cold:
-;; v54 = iconst.i8 1
+;; @0022 v54 = iconst.i8 1
;; @0022 call fn0(v0, v54) ; v54 = 1
;; <ss0, 34, 4294967295> @0022 call fn1(v0)
;; @0022 trap user1
@@ -71,8 +71,8 @@
;; block5:
;; @0022 v27 = load.i64 notrap aligned readonly can_move region5 v0+72
;; @0022 v28 = load.i64 notrap aligned region4 v27+8
-;; v48 = iconst.i64 16
-;; v49 = isub v28, v48 ; v48 = 16
+;; @0022 v48 = iconst.i64 16
+;; @0022 v49 = isub v28, v48 ; v48 = 16
;; @0022 v31 = icmp.i64 ugt v14, v49
;; @0022 brif v31, block6, block7
;;
@@ -92,8 +92,8 @@
;;
;; block8 cold:
;; @0022 v42 = iconst.i32 0
-;; v50 = iconst.i64 8
-;; v51 = iadd.i64 v14, v50 ; v50 = 8
+;; @0022 v50 = iconst.i64 8
+;; @0022 v51 = iadd.i64 v14, v50 ; v50 = 8
;; @0022 v46 = iconst.i32 8
;; @0022 v41 = iconst.i64 0
;; @0022 v47 = call fn3(v0, v42, v51, v46, v3, v41) ; v42 = 0, v46 = 8, v41 = 0
@@ -102,8 +102,8 @@
;; block9:
;; @0022 v22 = load.i64 notrap aligned readonly can_move region3 v0+56
;; @0022 v23 = iadd v22, v14
-;; v52 = iconst.i64 8
-;; v53 = iadd v23, v52 ; v52 = 8
+;; @0022 v52 = iconst.i64 8
+;; @0022 v53 = iadd v23, v52 ; v52 = 8
;; @0022 store.i64 little region6 v3, v53
;; <ss0, 37, 4294967295> @0025 call fn2(v0)
;; @0025 jump block1
diff --git a/tests/disas/stack-switching/resume-suspend-data-passing.wat b/tests/disas/stack-switching/resume-suspend-data-passing.wat
index eb85b89a34..83f7a22531 100644
--- a/tests/disas/stack-switching/resume-suspend-data-passing.wat
+++ b/tests/disas/stack-switching/resume-suspend-data-passing.wat
@@ -79,19 +79,19 @@
;; @0044 jump block4(v8, v9, v4)
;;
;; block4(v10: i64, v11: i64, v71: i32):
-;; v80 = iconst.i64 1
-;; v81 = icmp eq v10, v80 ; v80 = 1
+;; @0044 v80 = iconst.i64 1
+;; @0044 v81 = icmp eq v10, v80 ; v80 = 1
;; @0044 trapnz v81, user22
;; @0044 jump block5
;;
;; block5:
;; @0044 v14 = load.i64 notrap aligned region3 v11+88
;; @0044 v15 = load.i64 notrap aligned region3 v11+96
-;; v82 = iconst.i64 40
-;; v83 = iadd v15, v82 ; v82 = 40
+;; @0044 v82 = iconst.i64 40
+;; @0044 v83 = iadd v15, v82 ; v82 = 40
;; @0044 v18 = load.i64 notrap aligned region4 v83+8
;; @0044 v19 = load.i32 notrap aligned region5 v15+56
-;; v84 = iconst.i32 0
+;; @003a v84 = iconst.i32 0
;; v74 = iconst.i32 3
;; @0044 v5 = iconst.i64 48
;; @0044 v6 = iadd.i64 v0, v5 ; v5 = 48
@@ -108,48 +108,48 @@
;; @0044 v25 = uextend.i64 v86
;; @0044 v26 = iadd.i64 v18, v25
;; @0044 v27 = load.i64 notrap aligned region6 v26
-;; v87 = iadd.i64 v0, v5 ; v5 = 48
-;; v88 = icmp eq v27, v87
-;; v89 = iconst.i32 1
-;; v90 = iadd.i32 v21, v89 ; v89 = 1
+;; @0044 v87 = iadd.i64 v0, v5 ; v5 = 48
+;; @0044 v88 = icmp eq v27, v87
+;; @0044 v89 = iconst.i32 1
+;; @0044 v90 = iadd.i32 v21, v89 ; v89 = 1
;; @0044 brif v88, block8, block6(v90)
;;
;; block8:
;; @0044 store.i64 notrap aligned region7 v11, v9+112
-;; v91 = iconst.i32 1
-;; v92 = iconst.i64 168
-;; v93 = iadd.i64 v9, v92 ; v92 = 168
+;; @0044 v91 = iconst.i32 1
+;; @0044 v92 = iconst.i64 168
+;; @0044 v93 = iadd.i64 v9, v92 ; v92 = 168
;; @0044 store notrap aligned region8 v91, v93+4 ; v91 = 1
;; @0044 store.i64 notrap aligned region4 v34, v93+8
;; @0044 store.i32 notrap aligned region6 v4, v34
;; @0044 store notrap aligned region4 v91, v93 ; v91 = 1
;; v94 = iconst.i32 3
;; @0044 store notrap aligned region9 v94, v9+32 ; v94 = 3
-;; v95 = iconst.i64 0
+;; @0044 v95 = iconst.i64 0
;; @0044 store notrap aligned region3 v95, v11+88 ; v95 = 0
;; @0044 store notrap aligned region3 v95, v11+96 ; v95 = 0
-;; v96 = iconst.i64 120
-;; v97 = iadd.i64 v11, v96 ; v96 = 120
+;; @0044 v96 = iconst.i64 120
+;; @0044 v97 = iadd.i64 v11, v96 ; v96 = 120
;; @0044 v49 = load.i64 notrap aligned region10 v97
-;; v98 = iconst.i64 -24
-;; v99 = iadd v49, v98 ; v98 = -24
+;; @0044 v98 = iconst.i64 -24
+;; @0044 v99 = iadd v49, v98 ; v98 = -24
;; @0044 v45 = uextend.i64 v21
;; v100 = iconst.i64 0x0002_0000_0000
;; v101 = bor v45, v100 ; v100 = 0x0002_0000_0000
;; @0044 v52 = stack_switch v99, v99, v101
-;; v102 = iconst.i64 32
-;; v103 = ushr v52, v102 ; v102 = 32
-;; v104 = iconst.i64 5
-;; v105 = icmp eq v103, v104 ; v104 = 5
+;; @0044 v102 = iconst.i64 32
+;; @0044 v103 = ushr v52, v102 ; v102 = 32
+;; @0044 v104 = iconst.i64 5
+;; @0044 v105 = icmp eq v103, v104 ; v104 = 5
;; @0044 brif v105, block10, block11
;;
;; block10 cold:
;; @0044 v59 = load.i64 notrap aligned region4 v93+8
;; @0044 v60 = load.i32 notrap aligned region6 v59
-;; v110 = iconst.i32 0
+;; @003a v110 = iconst.i32 0
;; @0044 store notrap aligned region4 v110, v93 ; v110 = 0
;; @0044 store notrap aligned region8 v110, v93+4 ; v110 = 0
-;; v111 = iconst.i64 0
+;; @0044 v111 = iconst.i64 0
;; @0044 store notrap aligned region4 v111, v93+8 ; v111 = 0
;; @0044 try_call fn0(v0, v60), sig0, block12, [ context v0 ]
;;
@@ -158,13 +158,13 @@
;;
;; block11:
;; @0044 v66 = load.i64 notrap aligned region4 v93+8
-;; v106 = iconst.i32 0
+;; @003a v106 = iconst.i32 0
;; @0044 store notrap aligned region4 v106, v93 ; v106 = 0
;; @0044 store notrap aligned region8 v106, v93+4 ; v106 = 0
-;; v107 = iconst.i64 0
+;; @0044 v107 = iconst.i64 0
;; @0044 store notrap aligned region4 v107, v93+8 ; v107 = 0
-;; v108 = iconst.i32 1
-;; v109 = isub.i32 v71, v108 ; v108 = 1
+;; @0044 v108 = iconst.i32 1
+;; @004a v109 = isub.i32 v71, v108 ; v108 = 1
;; @004d brif v109, block2(v109), block13
;;
;; block13:
@@ -260,27 +260,27 @@
;; @0062 v20 = ireduce.i64 v19
;; @0062 trapz v20, user16
;; @0062 v25 = load.i64 notrap aligned region7 v20+104
-;; v150 = iconst.i64 64
+;; @0058 v150 = iconst.i64 64
;; v151 = ushr.i128 v19, v150 ; v150 = 64
;; @0062 v24 = ireduce.i64 v151
;; @0062 v26 = icmp eq v25, v24
;; @0062 trapz v26, user23
-;; v152 = iconst.i64 1
-;; v153 = iadd v25, v152 ; v152 = 1
+;; @0062 v152 = iconst.i64 1
+;; @0062 v153 = iadd v25, v152 ; v152 = 1
;; @0062 store notrap aligned region7 v153, v20+104
;; @0062 v29 = load.i64 notrap aligned region8 v20+112
;; @0062 v31 = load.i64 notrap aligned region9 v30+88
;; @0062 v32 = load.i64 notrap aligned region9 v30+96
;; @0062 store notrap aligned region10 v31, v29+88
;; @0062 store notrap aligned region10 v32, v29+96
-;; v154 = iconst.i64 0
+;; @0062 v154 = iconst.i64 0
;; @0062 store notrap aligned region8 v154, v20+112 ; v154 = 0
-;; v155 = iconst.i64 2
+;; @0062 v155 = iconst.i64 2
;; @0062 store notrap aligned region9 v155, v30+88 ; v155 = 2
;; @0062 store notrap aligned region9 v20, v30+96
-;; v156 = iconst.i32 1
+;; @0062 v156 = iconst.i32 1
;; @0062 store notrap aligned region11 v156, v20+32 ; v156 = 1
-;; v157 = iconst.i32 2
+;; @0062 v157 = iconst.i32 2
;; @0062 store notrap aligned region11 v157, v32+32 ; v157 = 2
;; @0062 v43 = load.i64 notrap aligned region12 v30+72
;; @0062 v44 = load.i64 notrap aligned region13 v30+64
@@ -298,19 +298,19 @@
;; @0062 store notrap aligned region13 v51, v30+64
;; @0062 v52 = load.i64 notrap aligned region16 v20+24
;; @0062 store notrap aligned region14 v52, v30+80
-;; v158 = iconst.i64 40
-;; v159 = iadd v32, v158 ; v158 = 40
+;; @0062 v158 = iconst.i64 40
+;; @0062 v159 = iadd v32, v158 ; v158 = 40
;; @0062 store notrap aligned region18 v156, v159+4 ; v156 = 1
;; @0062 store.i64 notrap aligned region19 v56, v159+8
-;; v160 = iadd.i64 v0, v57 ; v57 = 48
+;; @0062 v160 = iadd.i64 v0, v57 ; v57 = 48
;; @0062 store notrap aligned region20 v160, v56
;; @0062 store notrap aligned region19 v156, v159 ; v156 = 1
;; @0062 store notrap aligned region21 v156, v32+56 ; v156 = 1
-;; v161 = iconst.i64 120
-;; v162 = iadd v29, v161 ; v161 = 120
+;; @0062 v161 = iconst.i64 120
+;; @0062 v162 = iadd v29, v161 ; v161 = 120
;; @0062 v67 = load.i64 notrap aligned region22 v162
-;; v163 = iconst.i64 -24
-;; v164 = iadd v67, v163 ; v163 = -24
+;; @0062 v163 = iconst.i64 -24
+;; @0062 v164 = iadd v67, v163 ; v163 = -24
;; v165 = iconst.i64 0x0001_0000_0000
;; @0062 v70 = stack_switch v164, v164, v165 ; v165 = 0x0001_0000_0000
;; @0062 v72 = load.i64 notrap aligned region9 v30+88
@@ -318,7 +318,7 @@
;; @0062 store notrap aligned region9 v31, v30+88
;; @0062 store notrap aligned region9 v32, v30+96
;; @0062 store notrap aligned region11 v156, v32+32 ; v156 = 1
-;; v166 = iconst.i32 0
+;; @0058 v166 = iconst.i32 0
;; @0062 store notrap aligned region19 v166, v159 ; v166 = 0
;; @0062 store notrap aligned region18 v166, v159+4 ; v166 = 0
;; @0062 store notrap aligned region19 v154, v159+8 ; v154 = 0
@@ -326,10 +326,10 @@
;; @0062 brif v70, block9, block6
;;
;; block9:
-;; v169 = iconst.i64 32
-;; v170 = ushr.i64 v70, v169 ; v169 = 32
-;; v171 = iconst.i64 4
-;; v172 = icmp eq v170, v171 ; v171 = 4
+;; @0062 v169 = iconst.i64 32
+;; @0062 v170 = ushr.i64 v70, v169 ; v169 = 32
+;; @0062 v171 = iconst.i64 4
+;; @0062 v172 = icmp eq v170, v171 ; v171 = 4
;; @0062 brif v172, block8, block7
;;
;; block8 cold:
@@ -343,15 +343,15 @@
;; @0062 store notrap aligned region13 v90, v30+64
;; @0062 v91 = load.i64 notrap aligned region16 v32+24
;; @0062 store notrap aligned region14 v91, v30+80
-;; v178 = iconst.i32 0
-;; v179 = iconst.i64 144
-;; v180 = iadd.i64 v73, v179 ; v179 = 144
+;; @0058 v178 = iconst.i32 0
+;; @0062 v179 = iconst.i64 144
+;; @0062 v180 = iadd.i64 v73, v179 ; v179 = 144
;; @0062 store notrap aligned region19 v178, v180 ; v178 = 0
;; @0062 store notrap aligned region18 v178, v180+4 ; v178 = 0
-;; v181 = iconst.i64 0
+;; @0062 v181 = iconst.i64 0
;; @0062 store notrap aligned region19 v181, v180+8 ; v181 = 0
-;; v182 = iconst.i64 168
-;; v183 = iadd.i64 v73, v182 ; v182 = 168
+;; @0062 v182 = iconst.i64 168
+;; @0062 v183 = iadd.i64 v73, v182 ; v182 = 168
;; @0062 store notrap aligned region19 v178, v183 ; v178 = 0
;; @0062 store notrap aligned region18 v178, v183+4 ; v178 = 0
;; @0062 store notrap aligned region19 v181, v183+8 ; v181 = 0
@@ -382,11 +382,11 @@
;; @0062 trap user12
;;
;; block13:
-;; v173 = iconst.i64 168
-;; v174 = iadd.i64 v73, v173 ; v173 = 168
+;; @0062 v173 = iconst.i64 168
+;; @0062 v174 = iadd.i64 v73, v173 ; v173 = 168
;; @0062 v125 = load.i64 notrap aligned region19 v174+8
;; @0062 v126 = load.i32 notrap aligned region20 v125
-;; v175 = iconst.i32 0
+;; @0058 v175 = iconst.i32 0
;; @0062 store notrap aligned region19 v175, v174 ; v175 = 0
;; @0062 jump block4
;;
@@ -408,16 +408,16 @@
;; @0062 v137 = iconst.i64 144
;; @0062 v138 = iadd.i64 v73, v137 ; v137 = 144
;; @0062 v139 = load.i64 notrap aligned region19 v138+8
-;; v167 = iconst.i32 0
+;; @0058 v167 = iconst.i32 0
;; @0062 store notrap aligned region19 v167, v138 ; v167 = 0
;; @0062 store notrap aligned region18 v167, v138+4 ; v167 = 0
-;; v168 = iconst.i64 0
+;; @0062 v168 = iconst.i64 0
;; @0062 store notrap aligned region19 v168, v138+8 ; v168 = 0
;; @0068 return
;;
;; block4:
;; @0062 v118 = uextend.i128 v116
-;; v176 = iconst.i64 64
+;; @0058 v176 = iconst.i64 64
;; v177 = ishl v118, v176 ; v176 = 64
;; @0062 v117 = uextend.i128 v73
;; @0062 v122 = bor v177, v117
diff --git a/tests/disas/stack-switching/resume-suspend.wat b/tests/disas/stack-switching/resume-suspend.wat
index 5a9c999600..560bf001db 100644
--- a/tests/disas/stack-switching/resume-suspend.wat
+++ b/tests/disas/stack-switching/resume-suspend.wat
@@ -52,19 +52,19 @@
;; @003b jump block2(v5, v6)
;;
;; block2(v7: i64, v8: i64):
-;; v71 = iconst.i64 1
-;; v72 = icmp eq v7, v71 ; v71 = 1
+;; @003b v71 = iconst.i64 1
+;; @003b v72 = icmp eq v7, v71 ; v71 = 1
;; @003b trapnz v72, user22
;; @003b jump block3
;;
;; block3:
;; @003b v11 = load.i64 notrap aligned region3 v8+88
;; @003b v12 = load.i64 notrap aligned region3 v8+96
-;; v73 = iconst.i64 40
-;; v74 = iadd v12, v73 ; v73 = 40
+;; @003b v73 = iconst.i64 40
+;; @003b v74 = iadd v12, v73 ; v73 = 40
;; @003b v15 = load.i64 notrap aligned region4 v74+8
;; @003b v16 = load.i32 notrap aligned region5 v12+56
-;; v75 = iconst.i32 0
+;; @003b v75 = iconst.i32 0
;; v65 = iconst.i32 3
;; @003b v2 = iconst.i64 48
;; @003b v3 = iadd.i64 v0, v2 ; v2 = 48
@@ -81,15 +81,15 @@
;; @003b v22 = uextend.i64 v77
;; @003b v23 = iadd.i64 v15, v22
;; @003b v24 = load.i64 notrap aligned region6 v23
-;; v78 = iadd.i64 v0, v2 ; v2 = 48
-;; v79 = icmp eq v24, v78
-;; v80 = iconst.i32 1
-;; v81 = iadd.i32 v18, v80 ; v80 = 1
+;; @003b v78 = iadd.i64 v0, v2 ; v2 = 48
+;; @003b v79 = icmp eq v24, v78
+;; @003b v80 = iconst.i32 1
+;; @003b v81 = iadd.i32 v18, v80 ; v80 = 1
;; @003b brif v79, block6, block4(v81)
;;
;; block6:
;; @003b store.i64 notrap aligned region7 v8, v6+112
-;; v82 = iconst.i32 1
+;; @003b v82 = iconst.i32 1
;; @003b v28 = iconst.i64 168
;; @003b v29 = iadd.i64 v6, v28 ; v28 = 168
;; @003b store notrap aligned region8 v82, v29+4 ; v82 = 1
@@ -116,13 +116,13 @@
;; @003b brif v51, block8, block9
;;
;; block8 cold:
-;; v87 = iadd.i64 v6, v28 ; v28 = 168
+;; @003b v87 = iadd.i64 v6, v28 ; v28 = 168
;; @003b v54 = load.i64 notrap aligned region4 v87+8
;; @003b v55 = load.i32 notrap aligned region6 v54
-;; v88 = iconst.i32 0
+;; @003b v88 = iconst.i32 0
;; @003b store notrap aligned region4 v88, v87 ; v88 = 0
;; @003b store notrap aligned region8 v88, v87+4 ; v88 = 0
-;; v89 = iconst.i64 0
+;; @003b v89 = iconst.i64 0
;; @003b store notrap aligned region4 v89, v87+8 ; v89 = 0
;; @003b try_call fn0(v0, v55), sig0, block10, [ context v0 ]
;;
@@ -130,12 +130,12 @@
;; @003b trap user12
;;
;; block9:
-;; v84 = iadd.i64 v6, v28 ; v28 = 168
+;; @003b v84 = iadd.i64 v6, v28 ; v28 = 168
;; @003b v61 = load.i64 notrap aligned region4 v84+8
-;; v85 = iconst.i32 0
+;; @003b v85 = iconst.i32 0
;; @003b store notrap aligned region4 v85, v84 ; v85 = 0
;; @003b store notrap aligned region8 v85, v84+4 ; v85 = 0
-;; v86 = iconst.i64 0
+;; @003b v86 = iconst.i64 0
;; @003b store notrap aligned region4 v86, v84+8 ; v86 = 0
;; @003d jump block1
;;
@@ -268,7 +268,7 @@
;; @004e store notrap aligned region9 v37, v36+88
;; @004e store notrap aligned region9 v38, v36+96
;; @004e store notrap aligned region11 v44, v38+32 ; v44 = 1
-;; v169 = iconst.i32 0
+;; @0045 v169 = iconst.i32 0
;; @004e store notrap aligned region19 v169, v60 ; v169 = 0
;; @004e store notrap aligned region18 v169, v60+4 ; v169 = 0
;; @004e store notrap aligned region19 v2, v60+8 ; v2 = 0
@@ -293,15 +293,15 @@
;; @004e store notrap aligned region13 v96, v36+64
;; @004e v97 = load.i64 notrap aligned region16 v38+24
;; @004e store notrap aligned region14 v97, v36+80
-;; v178 = iconst.i32 0
-;; v179 = iconst.i64 144
-;; v180 = iadd.i64 v79, v179 ; v179 = 144
+;; @0045 v178 = iconst.i32 0
+;; @004e v179 = iconst.i64 144
+;; @004e v180 = iadd.i64 v79, v179 ; v179 = 144
;; @004e store notrap aligned region19 v178, v180 ; v178 = 0
;; @004e store notrap aligned region18 v178, v180+4 ; v178 = 0
-;; v181 = iconst.i64 0
+;; @0040 v181 = iconst.i64 0
;; @004e store notrap aligned region19 v181, v180+8 ; v181 = 0
-;; v182 = iconst.i64 168
-;; v183 = iadd.i64 v79, v182 ; v182 = 168
+;; @004e v182 = iconst.i64 168
+;; @004e v183 = iadd.i64 v79, v182 ; v182 = 168
;; @004e store notrap aligned region19 v178, v183 ; v178 = 0
;; @004e store notrap aligned region18 v178, v183+4 ; v178 = 0
;; @004e store notrap aligned region19 v181, v183+8 ; v181 = 0
@@ -335,10 +335,10 @@
;; @004e v129 = iconst.i64 168
;; @004e v130 = iadd.i64 v79, v129 ; v129 = 168
;; @004e v131 = load.i64 notrap aligned region19 v130+8
-;; v175 = iconst.i32 0
+;; @0045 v175 = iconst.i32 0
;; @004e store notrap aligned region19 v175, v130 ; v175 = 0
;; @004e v124 = uextend.i128 v122
-;; v176 = iconst.i64 64
+;; @0040 v176 = iconst.i64 64
;; v177 = ishl v124, v176 ; v176 = 64
;; @004e v123 = uextend.i128 v79
;; @004e v128 = bor v177, v123
@@ -362,13 +362,13 @@
;; @004e v142 = iconst.i64 144
;; @004e v143 = iadd.i64 v79, v142 ; v142 = 144
;; @004e v144 = load.i64 notrap aligned region19 v143+8
-;; v170 = iconst.i32 0
+;; @0045 v170 = iconst.i32 0
;; @004e store notrap aligned region19 v170, v143 ; v170 = 0
;; @004e store notrap aligned region18 v170, v143+4 ; v170 = 0
-;; v171 = iconst.i64 0
+;; @0040 v171 = iconst.i64 0
;; @004e store notrap aligned region19 v171, v143+8 ; v171 = 0
-;; v172 = uextend.i128 v171 ; v171 = 0
-;; v173 = iconst.i64 64
+;; @0040 v172 = uextend.i128 v171 ; v171 = 0
+;; @0040 v173 = iconst.i64 64
;; v174 = ishl v172, v173 ; v173 = 64
;; @0040 v8 = bor v174, v172
;; @0056 jump block2(v8)
diff --git a/tests/disas/typed-funcrefs.wat b/tests/disas/typed-funcrefs.wat
index eaf1d3a54b..6b2e5ca34a 100644
--- a/tests/disas/typed-funcrefs.wat
+++ b/tests/disas/typed-funcrefs.wat
@@ -165,12 +165,12 @@
;; v69 = iconst.i64 16
;; @005b v40 = iadd.i64 v11, v69 ; v69 = 16
;; @005b v43 = load.i64 user6 aligned region3 v40
-;; v70 = iconst.i64 -2
-;; v71 = band v43, v70 ; v70 = -2
+;; @0048 v70 = iconst.i64 -2
+;; @005b v71 = band v43, v70 ; v70 = -2
;; @005b brif v43, block5(v71), block4
;;
;; block4 cold:
-;; v72 = iconst.i32 0
+;; @003c v72 = iconst.i32 0
;; v68 = iconst.i64 2
;; @005b v49 = call fn0(v0, v72, v68) ; v72 = 0, v68 = 2
;; @005b jump block5(v49)
@@ -223,12 +223,12 @@
;; v69 = iconst.i64 16
;; @0087 v40 = iadd.i64 v11, v69 ; v69 = 16
;; @0087 v43 = load.i64 user6 aligned region3 v40
-;; v70 = iconst.i64 -2
-;; v71 = band v43, v70 ; v70 = -2
+;; @0075 v70 = iconst.i64 -2
+;; @0087 v71 = band v43, v70 ; v70 = -2
;; @0087 brif v43, block5(v71), block4
;;
;; block4 cold:
-;; v72 = iconst.i32 0
+;; @0069 v72 = iconst.i32 0
;; v68 = iconst.i64 2
;; @0087 v49 = call fn0(v0, v72, v68) ; v72 = 0, v68 = 2
;; @0087 jump block5(v49)