From 2e9b821350221fc2defa89e9c4ecefc1c273855b Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Fri, 14 Jul 2023 22:02:10 +0100
Subject: Handle params when defining functions in LLVM backend

---
 .../backends/llvm/LlvmCodeGenClosures.java         | 17 ++++++-----
 .../llvm/LlvmCodeGenDefineFunctionTests.java       | 35 ++++++++++++++++------
 2 files changed, 35 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenClosures.java b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenClosures.java
index a68d200f..b32d69b7 100644
--- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenClosures.java
+++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenClosures.java
@@ -89,16 +89,22 @@ public class LlvmCodeGenClosures {
             bodyContext = functionClosurePointerResult.context();
 
             var shedParams = Stream.concat(positionalParams.stream(), namedParams.stream()).toList();
+            var llvmParams = new ArrayList<LlvmParam>();
+            llvmParams.add(new LlvmParam(
+                closureTypes.closurePointer(),
+                functionClosurePointer.name()
+            ));
 
             for (var shedParam : shedParams) {
                 var paramResult = bodyContext.generateVariableLocal(
                     LlvmCodeGenLocalVariableSpace.PARAM,
                     shedParam.name()
                 );
-                var llvmParam = paramResult.value();
+                var llvmParamVariable = paramResult.value();
                 bodyContext = paramResult.context();
 
-                bodyContext = bodyContext.addShedLocal(shedParam.name(), llvmParam);
+                bodyContext = bodyContext.addShedLocal(shedParam.name(), llvmParamVariable);
+                llvmParams.add(new LlvmParam(LlvmCodeGenTypes.VALUE_TYPE, llvmParamVariable.name()));
             }
 
             for (var freeVariable : freeVariables) {
@@ -115,12 +121,7 @@ public class LlvmCodeGenClosures {
             var function = bodyContext.toFunction(
                 topLevelEntityName,
                 LlvmCodeGenTypes.VALUE_TYPE,
-                List.of(
-                    new LlvmParam(
-                        closureTypes.closurePointer(),
-                        functionClosurePointer.name()
-                    )
-                )
+                llvmParams
             );
             return bodyContext.toResult(function);
         });
diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenDefineFunctionTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenDefineFunctionTests.java
index 1baf847c..885306b3 100644
--- a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenDefineFunctionTests.java
+++ b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCodeGenDefineFunctionTests.java
@@ -3,24 +3,15 @@ package org.shedlang.compiler.backends.llvm;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.shedlang.compiler.ast.typed.FreeVariables;
-import org.shedlang.compiler.backends.llvm.ir.LlvmIrSerializer;
 import org.shedlang.compiler.backends.llvm.ir.ast.LlvmIr;
-import org.shedlang.compiler.backends.llvm.ir.ast.operands.LlvmOperand;
 import org.shedlang.compiler.sources.Sources;
 import org.shedlang.compiler.stackir.instructions.DefineFunctionInstruction;
 import org.shedlang.compiler.stackir.instructions.Instructions;
 import org.shedlang.compiler.testing.snapshots.SnapshotResolver;
 import org.shedlang.compiler.testing.snapshots.Snapshotter;
-import org.zwobble.precisely.Matcher;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
-
-import static org.shedlang.compiler.backends.llvm.ir.ast.LlvmIrMatchers.isLlvmVariableLocal;
-import static org.shedlang.compiler.util.Iterables.forEachInterspersed;
-import static org.zwobble.precisely.AssertThat.assertThat;
-import static org.zwobble.precisely.Matchers.*;
 
 @ExtendWith({SnapshotResolver.class})
 public class LlvmCodeGenDefineFunctionTests {
@@ -65,4 +56,30 @@ public class LlvmCodeGenDefineFunctionTests {
 
         snapshotter.assertSnapshot(LlvmCodeGenTesting.serializeContext(result));
     }
+
+    @Test
+    public void positionalAndNamedParamsAreDefined(Snapshotter snapshotter) throws IOException {
+        var instruction = new DefineFunctionInstruction(
+            "f",
+            List.of(Instructions.param("param1"), Instructions.param("param2")),
+            List.of(Instructions.param("paramA"), Instructions.param("paramB")),
+            FreeVariables.of("a", "b"),
+            List.of(
+                Instructions.localLoad("a"),
+                Instructions.localLoad("param1"),
+                Instructions.intAdd(),
+                Instructions.localLoad("paramA"),
+                Instructions.intAdd(),
+                Instructions.return_()
+            ),
+            Sources.NULL
+        );
+        var context = LlvmCodeGenContext.EMPTY
+            .addShedLocal("a", LlvmIr.operandInt(1))
+            .addShedLocal("b", LlvmIr.operandInt(2));
+
+        var result = LlvmCodeGen.generateInstruction(instruction, context);
+
+        snapshotter.assertSnapshot(LlvmCodeGenTesting.serializeContext(result));
+    }
 }
-- 
cgit v1.2.3