Support bool-to-int and int-to-bool on wasm64

2 files changed, 94 insertions, 12 deletions

diff --git a/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java b/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java
index b1ac6248..cdc18039 100644
--- a/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java
+++ b/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java
@@ -202,12 +202,17 @@ public class PatioToWasm {
             case PatioBlock patioBlock ->
                 generateInstructions(patioBlock.body(), context);
 
-            case PatioBoolToInt patioBoolToInt ->
-                generateOperandToPatioLocal(
-                    patioBoolToInt.target(),
-                    patioBoolToInt.value(),
-                    context
-                );
+            case PatioBoolToInt patioBoolToInt -> {
+                context = generateOperand(patioBoolToInt.value(), context);
+
+                if (platformTarget == WasmTarget.WASM64) {
+                    context = context.addInstruction(new WasmI64ExtendI32Unsigned());
+                }
+
+                context = popIntoPatioLocal(patioBoolToInt.target(), context);
+
+                yield context;
+            }
 
             case PatioCall patioCall -> {
                 for (var patioArg : patioCall.args()) {
@@ -305,12 +310,17 @@ public class PatioToWasm {
                     context
                 );
 
-            case PatioIntToBool patioIntToBool ->
-                generateOperandToPatioLocal(
-                    patioIntToBool.target(),
-                    patioIntToBool.value(),
-                    context
-                );
+            case PatioIntToBool patioIntToBool -> {
+                context = generateOperand(patioIntToBool.value(), context);
+
+                if (platformTarget == WasmTarget.WASM64) {
+                    context = context.addInstruction(new WasmI32WrapI64());
+                }
+
+                context = popIntoPatioLocal(patioIntToBool.target(), context);
+
+                yield context;
+            }
 
             case PatioIntToDataPtr patioIntToDataPtr ->
                 generateOperandToPatioLocal(
diff --git a/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java b/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java
index 1a6813d4..db56958a 100644
--- a/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java
+++ b/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java
@@ -91,6 +91,78 @@ public abstract class PatioExampleTests {
     }
 
     @Test
+    public void boolToIntToBoolIsIdentityForFalse() throws IOException, InterruptedException {
+        var patioFunction = PatioFunctionDefinition.builder()
+            .withName(FUNCTION_NAME)
+            .withReturnType(PatioTypes.INT)
+            .addLocal(Patio.val("x", PatioTypes.BOOL))
+            .addLocal(Patio.val("y", PatioTypes.INT))
+            .addLocal(Patio.val("z", PatioTypes.BOOL))
+            .addLocal(Patio.val("r", PatioTypes.INT))
+            .addBodyInstruction(Patio.localStore(
+                Patio.localRef("x"),
+                Patio.bool(false)
+            ))
+            .addBodyInstruction(Patio.boolToInt(
+                Patio.localRef("y"),
+                Patio.localRef("x")
+            ))
+            .addBodyInstruction(Patio.intToBool(
+                Patio.localRef("z"),
+                Patio.localRef("y")
+            ))
+            .addBodyInstruction(Patio.if_(
+                List.of(Patio.localRef("r")),
+                Patio.localRef("z"),
+                Patio.block(List.of(), List.of(Patio.int_(42))),
+                Patio.block(List.of(), List.of(Patio.int_(47)))
+            ))
+            .addBodyInstruction(Patio.return_(Patio.localRef("r")))
+            .build();
+        var patio = Patio.compilationUnit(List.of(patioFunction));
+
+        var result = run(patio);
+
+        assertThat(result, isSilentExit(47));
+    }
+
+    @Test
+    public void boolToIntToBoolIsIdentityForTrue() throws IOException, InterruptedException {
+        var patioFunction = PatioFunctionDefinition.builder()
+            .withName(FUNCTION_NAME)
+            .withReturnType(PatioTypes.INT)
+            .addLocal(Patio.val("x", PatioTypes.BOOL))
+            .addLocal(Patio.val("y", PatioTypes.INT))
+            .addLocal(Patio.val("z", PatioTypes.BOOL))
+            .addLocal(Patio.val("r", PatioTypes.INT))
+            .addBodyInstruction(Patio.localStore(
+                Patio.localRef("x"),
+                Patio.bool(true)
+            ))
+            .addBodyInstruction(Patio.boolToInt(
+                Patio.localRef("y"),
+                Patio.localRef("x")
+            ))
+            .addBodyInstruction(Patio.intToBool(
+                Patio.localRef("z"),
+                Patio.localRef("y")
+            ))
+            .addBodyInstruction(Patio.if_(
+                List.of(Patio.localRef("r")),
+                Patio.localRef("z"),
+                Patio.block(List.of(), List.of(Patio.int_(42))),
+                Patio.block(List.of(), List.of(Patio.int_(47)))
+            ))
+            .addBodyInstruction(Patio.return_(Patio.localRef("r")))
+            .build();
+        var patio = Patio.compilationUnit(List.of(patioFunction));
+
+        var result = run(patio);
+
+        assertThat(result, isSilentExit(42));
+    }
+
+    @Test
     public void intAdd() throws IOException, InterruptedException {
         var patioFunction = PatioFunctionDefinition.builder()
             .withName(FUNCTION_NAME)