From d47fd4b64d148fa25682209ccaec1f25a9156620 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 17 Jun 2023 21:20:10 +0100 Subject: Resuse getClosureFunctionPointerPointer() --- .../backends/llvm/LlvmCompilerClosures.java | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/main/java') 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 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)) )); -- cgit v1.2.3