fix: sort module imports and functions in PrettyPrint impl to stabilize

expect_masm in tests.
0xPolygonMiden · Oct 22, 2024 · 54d3ccf · 54d3ccf
1 parent 228bfa1
commit 54d3ccf
Show file tree

Hide file tree

Showing 3 changed files with 1,884 additions and 1,880 deletions.
diff --git a/codegen/masm/src/masm/module.rs b/codegen/masm/src/masm/module.rs
@@ -233,7 +233,9 @@ impl midenc_hir::formatter::PrettyPrint for Module {
             }
         }
 
-        for (i, import) in self.imports.iter().enumerate() {
+        let mut imports_sorted = self.imports.iter().collect::<Vec<_>>();
+        imports_sorted.sort();
+        for (i, import) in imports_sorted.iter().enumerate() {
             if i > 0 {
                 doc += nl();
             }
@@ -266,7 +268,9 @@ impl midenc_hir::formatter::PrettyPrint for Module {
             doc += nl() + nl();
         }
 
-        for (i, func) in self.functions.iter().enumerate() {
+        let mut functions_sorted = self.functions.iter().collect::<Vec<_>>();
+        functions_sorted.sort_by_key(|f| f.name);
+        for (i, func) in functions_sorted.iter().enumerate() {
             if i > 0 {
                 doc += nl();
             }

diff --git a/tests/integration/expected/abi_transform_tx_kernel_get_inputs_4.masm b/tests/integration/expected/abi_transform_tx_kernel_get_inputs_4.masm
@@ -1,12 +1,7 @@
 # mod abi_transform_tx_kernel_get_inputs_4
 
-use.miden::note
 use.intrinsics::mem
-
-export.entrypoint
-    exec."miden_base_sys::bindings::note::get_inputs"
-end
-
+use.miden::note
 
 export."miden_base_sys::bindings::note::get_inputs"
     mem_load.0x00011000
@@ -177,6 +172,11 @@ export."miden_base_sys::bindings::note::get_inputs"
 end
 
 
+export."alloc::raw_vec::handle_error"
+    push.0 assert
+end
+
+
 export."alloc::raw_vec::RawVec<T,A>::try_allocate_in"
     dup.1
     neq.0
@@ -494,71 +494,6 @@ export."alloc::raw_vec::RawVec<T,A>::try_allocate_in"
 end
 
 
-export."__rust_alloc"
-    push.1048576
-    movup.2
-    swap.1
-    exec."<miden_sdk_alloc::BumpAlloc as core::alloc::global::GlobalAlloc>::alloc"
-end
-
-
-export."__rust_alloc_zeroed"
-    push.1048576
-    dup.1
-    swap.2
-    swap.3
-    swap.1
-    exec."<miden_sdk_alloc::BumpAlloc as core::alloc::global::GlobalAlloc>::alloc"
-    dup.0
-    eq.0
-    neq.0
-    if.true
-        swap.1 drop
-    else
-        push.0
-        push.128
-        u32and
-        movup.2
-        dup.2
-        push.0
-        dup.2
-        gte.0
-        while.true
-            dup.1
-            dup.1
-            push.1
-            u32overflowing_madd
-            assertz
-            dup.4
-            swap.1
-            dup.0
-            u32mod.16
-            dup.0
-            u32mod.4
-            swap.1
-            u32div.4
-            movup.2
-            u32div.16
-            dup.2
-            dup.2
-            dup.2
-            exec.::intrinsics::mem::load_sw
-            push.4294967040
-            u32and
-            movup.5
-            u32or
-            movdn.4
-            exec.::intrinsics::mem::store_sw
-            u32wrapping_add.1
-            dup.0
-            dup.3
-            u32gte
-        end
-        dropw
-    end
-end
-
-
 export."<miden_sdk_alloc::BumpAlloc as core::alloc::global::GlobalAlloc>::alloc"
     push.32
     dup.2
@@ -770,8 +705,73 @@ export."<miden_sdk_alloc::BumpAlloc as core::alloc::global::GlobalAlloc>::alloc"
 end
 
 
-export."alloc::raw_vec::handle_error"
-    push.0 assert
+export."__rust_alloc"
+    push.1048576
+    movup.2
+    swap.1
+    exec."<miden_sdk_alloc::BumpAlloc as core::alloc::global::GlobalAlloc>::alloc"
+end
+
+
+export."__rust_alloc_zeroed"
+    push.1048576
+    dup.1
+    swap.2
+    swap.3
+    swap.1
+    exec."<miden_sdk_alloc::BumpAlloc as core::alloc::global::GlobalAlloc>::alloc"
+    dup.0
+    eq.0
+    neq.0
+    if.true
+        swap.1 drop
+    else
+        push.0
+        push.128
+        u32and
+        movup.2
+        dup.2
+        push.0
+        dup.2
+        gte.0
+        while.true
+            dup.1
+            dup.1
+            push.1
+            u32overflowing_madd
+            assertz
+            dup.4
+            swap.1
+            dup.0
+            u32mod.16
+            dup.0
+            u32mod.4
+            swap.1
+            u32div.4
+            movup.2
+            u32div.16
+            dup.2
+            dup.2
+            dup.2
+            exec.::intrinsics::mem::load_sw
+            push.4294967040
+            u32and
+            movup.5
+            u32or
+            movdn.4
+            exec.::intrinsics::mem::store_sw
+            u32wrapping_add.1
+            dup.0
+            dup.3
+            u32gte
+        end
+        dropw
+    end
+end
+
+
+export.entrypoint
+    exec."miden_base_sys::bindings::note::get_inputs"
 end