aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-06-17 21:20:10 +0100
committerMichael Williamson <mike@zwobble.org>2023-06-17 21:20:10 +0100
commitd47fd4b64d148fa25682209ccaec1f25a9156620 (patch)
treebc3c41508a397afd4d77be892283ec7564b3dcd5 /src/main/java
parent3c40d3f2134b7cdcc543c76c6d8206a8615fd32b (diff)
Resuse getClosureFunctionPointerPointer()
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerClosures.java22
1 files changed, 11 insertions, 11 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 071b60ff..21e50495 100644
--- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerClosures.java
+++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerClosures.java
@@ -109,19 +109,14 @@ public class LlvmCompilerClosures {
)
));
- var closureFunctionPointerPointerResult = context.generateVariableLocal(
- LlvmCompilerLocalVariableSpace.CLOSURE_FUNCTION_POINTER_POINTER
+ var closureFunctionPointerPointerResult = getClosureFunctionPointerPointer(
+ closurePointer,
+ closureTypes,
+ context
);
var closureFunctionPointerPointer = closureFunctionPointerPointerResult.value();
context = closureFunctionPointerPointerResult.context();
- context = context.addInstruction(new LlvmGetElementPtr(
- closureFunctionPointerPointer,
- closureTypes.closurePointer(),
- closurePointer,
- List.of(LlvmTypedOperand.arrayIndex(0), LlvmTypedOperand.structureIndex(0))
- ));
-
context = context.addInstruction(new LlvmStore(
closureTypes.closureFunctionPointer(),
new LlvmVariableGlobal(topLevelEntityName),
@@ -228,7 +223,11 @@ public class LlvmCompilerClosures {
LlvmOperand closurePointer,
LlvmCompilerContext context
) {
- var functionPointerPointerResult = getClosureFunctionPointerPointer(closurePointer, context);
+ var functionPointerPointerResult = getClosureFunctionPointerPointer(
+ closurePointer,
+ CALLABLE_TYPES,
+ context
+ );
var functionPointerPointer = functionPointerPointerResult.value();
context = functionPointerPointerResult.context();
@@ -247,6 +246,7 @@ public class LlvmCompilerClosures {
private static LlvmCompilerResult<LlvmVariableLocal> getClosureFunctionPointerPointer(
LlvmOperand closurePointer,
+ Types closureTypes,
LlvmCompilerContext context
) {
var functionPointerPointerResult = context.generateVariableLocal(
@@ -257,7 +257,7 @@ public class LlvmCompilerClosures {
context = context.addInstruction(new LlvmGetElementPtr(
functionPointerPointer,
- CALLABLE_TYPES.closurePointer(),
+ closureTypes.closurePointer(),
closurePointer,
List.of(LlvmTypedOperand.arrayIndex(0), LlvmTypedOperand.structureIndex(0))
));