Extract castClosurePointerToValue

1 files changed, 20 insertions, 9 deletions

diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerClosures.java b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerClosures.java
index 9db59c56..26674a40 100644
--- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerClosures.java
+++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerClosures.java
@@ -156,18 +156,10 @@ public class LlvmCompilerClosures {
         }
 
 
-        var closureValueResult = context.generateVariableLocal(
-            LlvmCompilerLocalVariableSpace.CLOSURE_VALUE
-        );
+        var closureValueResult = castClosurePointerToValue(closurePointer, context);
         var closureValue = closureValueResult.value();
         context = closureValueResult.context();
 
-        context = context.addInstruction(new LlvmPtrToInt(
-            closureValue,
-            closurePointer,
-            LlvmCompilerTypes.VALUE_TYPE
-        ));
-
         context = context.push(closureValue);
 
         return context;
@@ -210,6 +202,25 @@ public class LlvmCompilerClosures {
         )).push(callTarget);
     }
 
+    private static LlvmCompilerResult<LlvmVariableLocal> castClosurePointerToValue(
+        LlvmOperand closurePointer,
+        LlvmCompilerContext context
+    ) {
+        var closureValueResult = context.generateVariableLocal(
+            LlvmCompilerLocalVariableSpace.CLOSURE_VALUE
+        );
+        var closureValue = closureValueResult.value();
+        context = closureValueResult.context();
+
+        context = context.addInstruction(new LlvmPtrToInt(
+            closureValue,
+            closurePointer,
+            LlvmCompilerTypes.VALUE_TYPE
+        ));
+
+        return context.toResult(closureValue);
+    }
+
     private static LlvmCompilerResult<LlvmVariableLocal> castValueToClosurePointer(
         LlvmOperand value,
         LlvmCompilerContext context