From d008e1d9e4c204e0a51699749476bdb7fe48753a Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sun, 3 Dec 2023 11:53:31 +0000
Subject: Add explicit return to namespace init functions

---
 .../java/org/shedlang/compiler/backends/llvm/LlvmPatioCodeGen.java    | 4 ----
 src/main/java/org/shedlang/compiler/patio/PatioCodeGenNamespaces.java | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmPatioCodeGen.java b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmPatioCodeGen.java
index e852ab98..37cda648 100644
--- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmPatioCodeGen.java
+++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmPatioCodeGen.java
@@ -208,10 +208,6 @@ public class LlvmPatioCodeGen {
         }
 
         functionContext = generateInstructions(patioFunctionDefinition.body(), functionContext);
-        // TODO: push into Patio?
-        if (!functionContext.instructions.isEmpty()) {
-            functionContext = functionContext.addTerminatorInstruction(new LlvmReturnVoid());
-        }
         var llvmBody = functionContext.basicBlocks;
 
         return context.addTopLevelEntity(new LlvmFunctionDefinition(
diff --git a/src/main/java/org/shedlang/compiler/patio/PatioCodeGenNamespaces.java b/src/main/java/org/shedlang/compiler/patio/PatioCodeGenNamespaces.java
index e87adb5e..8441fe21 100644
--- a/src/main/java/org/shedlang/compiler/patio/PatioCodeGenNamespaces.java
+++ b/src/main/java/org/shedlang/compiler/patio/PatioCodeGenNamespaces.java
@@ -65,6 +65,8 @@ public class PatioCodeGenNamespaces {
                     source
                 ));
 
+                initContext = initContext.addInstruction(new PatioReturnVoid(source));
+
                 return initContext;
             }
         );
-- 
cgit v1.2.3