From 74b9cec87c2d5958cf2076396fa0cbb5ae1e6e02 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 17 Jun 2023 21:36:45 +0100 Subject: Create FreeVariable type with index and name --- .../compiler/backends/llvm/LlvmCompilerClosures.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/main/java/org/shedlang/compiler/backends') 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 45b7e920..8e17ea1b 100644 --- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerClosures.java +++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerClosures.java @@ -1,5 +1,6 @@ package org.shedlang.compiler.backends.llvm; +import org.shedlang.compiler.ast.typed.FreeVariable; import org.shedlang.compiler.ast.typed.FreeVariables; import org.shedlang.compiler.backends.llvm.ir.ast.LlvmBasicBlock; import org.shedlang.compiler.backends.llvm.ir.ast.LlvmFunctionDefinition; @@ -114,16 +115,13 @@ public class LlvmCompilerClosures { context ); - var freeVariableIndex = 0; for (var freeVariable : freeVariables) { context = storeClosureFreeVariablePointer( closurePointer, - freeVariableIndex, freeVariable, closureTypes, context ); - freeVariableIndex++; } var closureValueResult = castClosurePointerToValue(closurePointer, context); @@ -299,14 +297,13 @@ public class LlvmCompilerClosures { private static LlvmCompilerContext storeClosureFreeVariablePointer( LlvmOperand closurePointer, - int freeVariableIndex, - String freeVariable, + FreeVariable freeVariable, Types closureTypes, LlvmCompilerContext context ) { var closureEnvironmentPointerResult = getClosureFreeVariablePointer( closurePointer, - freeVariableIndex, + freeVariable, closureTypes, context ); @@ -315,14 +312,14 @@ public class LlvmCompilerClosures { return context.addInstruction(new LlvmStore( LlvmCompilerTypes.VALUE_TYPE, - context.local(freeVariable), + context.local(freeVariable.name()), closureEnvironmentPointer )); } private static LlvmCompilerResult getClosureFreeVariablePointer( LlvmOperand closurePointer, - int freeVariableIndex, + FreeVariable freeVariable, Types closureTypes, LlvmCompilerContext context ) { @@ -339,7 +336,7 @@ public class LlvmCompilerClosures { List.of( LlvmTypedOperand.arrayIndex(0), LlvmTypedOperand.structureIndex(1), - LlvmTypedOperand.arrayIndex(freeVariableIndex) + LlvmTypedOperand.arrayIndex(freeVariable.index()) ) )); -- cgit v1.2.3