diff options
| author | Michael Williamson <mike@zwobble.org> | 2023-06-17 22:09:43 +0100 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2023-06-17 22:09:43 +0100 |
| commit | ddf005024d396dd4194447bdc0cbe6ef03d43df0 (patch) | |
| tree | 55c93e92c97ae4174b4348b3ba60468a0bc6a8d3 /src | |
| parent | 5966b8fbed429454f9de6756fc0cb54cb9d0aafa (diff) | |
Add loaded free variables as locals
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerClosures.java | 6 | ||||
| -rw-r--r-- | src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerDefineFunctionTests.java | 4 |
2 files changed, 6 insertions, 4 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 22c55ce2..1f977db2 100644 --- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerClosures.java +++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerClosures.java @@ -76,7 +76,7 @@ public class LlvmCompilerClosures { ); var functionContext = context.enterFunction(); - var functionClosurePointerResult = context.generateVariableLocal( + var functionClosurePointerResult = functionContext.generateVariableLocal( LlvmCompilerLocalVariableSpace.CLOSURE_POINTER ); var functionClosurePointer = functionClosurePointerResult.value(); @@ -355,11 +355,13 @@ public class LlvmCompilerClosures { var closureFreeVariable = closureFreeVariableResult.value(); context = closureFreeVariableResult.context(); - return context.addInstruction(new LlvmLoad( + context = context.addInstruction(new LlvmLoad( closureFreeVariable, LlvmCompilerTypes.VALUE_TYPE, closureFreeVariablePointer )); + + return context.addLocal(freeVariable.name(), closureFreeVariable); } private static LlvmCompilerResult<LlvmVariableLocal> getClosureFreeVariablePointer( diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerDefineFunctionTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerDefineFunctionTests.java index 9882a7af..376fac8e 100644 --- a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerDefineFunctionTests.java +++ b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerDefineFunctionTests.java @@ -76,7 +76,7 @@ public class LlvmCompilerDefineFunctionTests { List.of(), FreeVariables.of("a", "b"), List.of( - Instructions.pushUnit(), + Instructions.localLoad("a"), Instructions.return_() ), Sources.NULL @@ -99,7 +99,7 @@ public class LlvmCompilerDefineFunctionTests { %closureFreeVariable__a__0 = load i64, ptr %closureFreeVariablePointer__a__0 %closureFreeVariablePointer__b__0 = getelementptr {ptr, [2 x i64]}, ptr %closurePointer__0, i64 0, i32 1, i64 1 %closureFreeVariable__b__0 = load i64, ptr %closureFreeVariablePointer__b__0 - ret i64 0 + ret i64 %closureFreeVariable__a__0 } """)); |
