fix(compiler): tests of br_if

codegen/src/visitor/call.rs

@@ -73,7 +73,6 @@ impl Function {
         }
 
         // TODO: support same pc different jumps. (#160)
-        // TODO: store the params in memory
         self.table.call(self.masm.pc_offset(), index);
 
         // jump to the callee function

compiler/filetests/wat/br_if/as_block_last.wat

@@ -1,11 +1,15 @@
 ;;! target = "evm"
 (module
-  (func (export "as-block-last") (param i32)
-    (block
-     (call $dummy)
-     (call $dummy)
-     (br_if 0 (local.get 0))
-    )
-  )
-  (func $dummy)
-)
+ (func (export "as-block-last") (param i32)
+       (local.get 0)
+       (call $internal)
+       )
+ (func $internal (param i32)
+       (block
+           (call $dummy)
+         (call $dummy)
+         (br_if 0 (local.get 0))
+         )
+       )
+ (func $dummy)
+ )

tests/br_if.rs

@@ -1,17 +1,18 @@
 //! br_if tests for the zink compiler.
 use anyhow::Result;
 use filetests::Test;
-use zint::{Contract, HaltReason, OutOfGasError};
+use zint::Contract;
 
 #[test]
 fn as_block_last() -> Result<()> {
     let mut contract = Contract::from(Test::BR_IF_AS_BLOCK_LAST).pure().compile()?;
 
     let info = contract.execute(&[0])?;
+    assert!(info.halt.is_none());
     assert!(info.ret.is_empty());
 
     let info = contract.execute(&[42])?;
-    assert_eq!(info.halt, Some(HaltReason::OutOfGas(OutOfGasError::Basic)));
+    assert!(info.halt.is_none());
     assert!(info.ret.is_empty());
 
     Ok(())