diff options
| author | Michael Williamson <mike@zwobble.org> | 2023-06-16 23:08:09 +0100 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2023-06-16 23:08:09 +0100 |
| commit | 25ca0c973842be553326d3cd69ea72fd658b0ba6 (patch) | |
| tree | 73915d5b244b10f3181e6464da6272d6e051632b /src | |
| parent | ff769ec6795b7725f0bfb4d523e2762cb8e1f8c8 (diff) | |
Add explicit return instruction to function bodies
Diffstat (limited to 'src')
7 files changed, 98 insertions, 13 deletions
diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompiler.java b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompiler.java index 2ad82eef..26319b43 100644 --- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompiler.java +++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompiler.java @@ -1,6 +1,5 @@ package org.shedlang.compiler.backends.llvm; -import org.shedlang.compiler.backends.llvm.ir.ast.LlvmBasicBlock; import org.shedlang.compiler.backends.llvm.ir.ast.LlvmFunctionDefinition; import org.shedlang.compiler.backends.llvm.ir.ast.LlvmParam; import org.shedlang.compiler.backends.llvm.ir.ast.instructions.LlvmReturn; @@ -64,8 +63,6 @@ public class LlvmCompiler { functionContext = compileInstruction(bodyInstruction, functionContext); } // TODO: rejoin function context with context - // TODO: assert stack has exactly one element - var returnValue = functionContext.stack().get(0); yield context.addTopLevelEntity(new LlvmFunctionDefinition( topLevelEntityName, @@ -77,13 +74,7 @@ public class LlvmCompiler { "shed__env__0" ) ), - List.of( - new LlvmBasicBlock( - Optional.empty(), - List.of(), - new LlvmReturn(LlvmCompilerTypes.VALUE_TYPE, returnValue) - ) - ) + functionContext.basicBlocks() )); } case DiscardInstruction discardInstruction -> @@ -129,6 +120,16 @@ public class LlvmCompiler { case PushUnitInstruction pushUnit -> context.push(new LlvmOperandInt(0)); + + case ReturnInstruction returnInstruction -> { + var result = context.pop(); + var value = result.value(); + context = result.context(); + + yield context.addTerminatorInstruction( + new LlvmReturn(LlvmCompilerTypes.VALUE_TYPE, value) + ); + } }; } } diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerContext.java b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerContext.java index d558f483..256079bc 100644 --- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerContext.java +++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerContext.java @@ -1,9 +1,14 @@ package org.shedlang.compiler.backends.llvm; -import org.pcollections.*; +import org.pcollections.Empty; +import org.pcollections.PMap; +import org.pcollections.PStack; +import org.pcollections.PVector; +import org.shedlang.compiler.backends.llvm.ir.ast.LlvmBasicBlock; import org.shedlang.compiler.backends.llvm.ir.ast.LlvmGlobalDefinition; import org.shedlang.compiler.backends.llvm.ir.ast.LlvmTopLevelEntity; import org.shedlang.compiler.backends.llvm.ir.ast.instructions.LlvmInstruction; +import org.shedlang.compiler.backends.llvm.ir.ast.instructions.LlvmTerminatorInstruction; import org.shedlang.compiler.backends.llvm.ir.ast.operands.LlvmOperand; import org.shedlang.compiler.backends.llvm.ir.ast.operands.LlvmVariableLocal; import org.shedlang.compiler.typechecker.TypeInfo; @@ -16,6 +21,7 @@ public record LlvmCompilerContext( TypeInfo typeInfo, PStack<LlvmOperand> stack, PMap<String, LlvmOperand> locals, + PVector<LlvmBasicBlock> basicBlocks, PVector<LlvmInstruction> instructions, POrderedMap<String, LlvmTopLevelEntity> topLevelEntitiesByName, NameAllocator<LlvmCompilerLocalVariableSpace> localVariableNames @@ -28,6 +34,7 @@ public record LlvmCompilerContext( Empty.stack(), Empty.map(), Empty.vector(), + Empty.vector(), POrderedMap.empty(), NameAllocator.empty() ); @@ -38,6 +45,7 @@ public record LlvmCompilerContext( typeInfo, stack.plus(operand), locals, + basicBlocks, instructions, topLevelEntitiesByName, localVariableNames @@ -49,6 +57,7 @@ public record LlvmCompilerContext( typeInfo, stack.minus(0), locals, + basicBlocks, instructions, topLevelEntitiesByName, localVariableNames @@ -60,6 +69,7 @@ public record LlvmCompilerContext( typeInfo, stack, locals.plus(name, value), + basicBlocks, instructions, topLevelEntitiesByName, localVariableNames @@ -75,12 +85,31 @@ public record LlvmCompilerContext( typeInfo, stack, locals, + basicBlocks, instructions.plus(instruction), topLevelEntitiesByName, localVariableNames ); } + public LlvmCompilerContext addTerminatorInstruction( + LlvmTerminatorInstruction terminatorInstruction + ) { + return new LlvmCompilerContext( + typeInfo, + stack, + locals, + basicBlocks.plus(new LlvmBasicBlock( + Optional.empty(), + instructions, + terminatorInstruction + )), + Empty.vector(), + topLevelEntitiesByName, + localVariableNames + ); + } + public LlvmCompilerResult<LlvmGlobalDefinition> addGlobalDefinition( LlvmGlobalDefinitionBuilder builder ) { @@ -101,6 +130,7 @@ public record LlvmCompilerContext( typeInfo, stack, locals, + basicBlocks, instructions, topLevelEntitiesByName.plus(topLevelEntity.name(), topLevelEntity), localVariableNames @@ -152,6 +182,7 @@ public record LlvmCompilerContext( typeInfo, stack, locals, + basicBlocks, instructions, topLevelEntitiesByName, result.allocator() @@ -168,6 +199,7 @@ public record LlvmCompilerContext( Empty.stack(), Empty.map(), Empty.vector(), + Empty.vector(), topLevelEntitiesByName, NameAllocator.empty() ); diff --git a/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java b/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java index 6b8452c1..b8356ab4 100644 --- a/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java +++ b/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java @@ -76,6 +76,7 @@ public class StackCompiler { .collect(Collectors.toList()); body.add(new PushUnitInstruction(node.source())); + body.add(new ReturnInstruction(node.source())); var defineFunctionInstruction = new DefineFunctionInstruction( node.name(), 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 1575c2ad..f7e86765 100644 --- a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerDefineFunctionTests.java +++ b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerDefineFunctionTests.java @@ -25,7 +25,8 @@ public class LlvmCompilerDefineFunctionTests { List.of(), Set.of(), List.of( - Instructions.pushUnit() + Instructions.pushUnit(), + Instructions.return_() ), Sources.NULL ); diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerReturnTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerReturnTests.java new file mode 100644 index 00000000..f76383af --- /dev/null +++ b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerReturnTests.java @@ -0,0 +1,43 @@ +package org.shedlang.compiler.backends.llvm; + +import org.junit.jupiter.api.Test; +import org.shedlang.compiler.backends.llvm.ir.ast.LlvmIr; +import org.shedlang.compiler.backends.llvm.ir.ast.types.LlvmTypes; +import org.shedlang.compiler.stackir.instructions.Instructions; + +import static org.shedlang.compiler.backends.llvm.ir.ast.LlvmIrMatchers.*; +import static org.zwobble.precisely.AssertThat.assertThat; +import static org.zwobble.precisely.Matchers.equalTo; +import static org.zwobble.precisely.Matchers.isSequence; + +public class LlvmCompilerReturnTests { + @Test + public void returnCompilesToReturnInstruction() { + var instruction = Instructions.return_(); + var add = LlvmIr.add( + LlvmIr.variableLocal("x"), + LlvmTypes.INT_64, + LlvmIr.variableLocal("left"), + LlvmIr.variableLocal("right") + ); + var context = LlvmCompilerContext.EMPTY + .addInstruction(add) + .push(LlvmIr.variableLocal("a")) + .push(LlvmIr.variableLocal("b")); + + var result = LlvmCompiler.compileInstruction(instruction, context); + + assertThat(result.basicBlocks(), isSequence( + isLlvmBasicBlock( + isSequence( + equalTo(add) + ), + isLlvmReturn(LlvmCompilerTypes.VALUE_TYPE, isLlvmVariableLocal("b")) + ) + )); + assertThat(result.instructions(), isSequence()); + assertThat(result.stack(), isSequence( + isLlvmVariableLocal("a") + )); + } +} diff --git a/src/test/java/org/shedlang/compiler/stackir/StackCompilerFunctionDefinitionTests.java b/src/test/java/org/shedlang/compiler/stackir/StackCompilerFunctionDefinitionTests.java index 1c90a0a7..05063961 100644 --- a/src/test/java/org/shedlang/compiler/stackir/StackCompilerFunctionDefinitionTests.java +++ b/src/test/java/org/shedlang/compiler/stackir/StackCompilerFunctionDefinitionTests.java @@ -37,7 +37,8 @@ public class StackCompilerFunctionDefinitionTests { has("body", x -> x.body(), isSequence( isPushStringInstruction("hello"), isDiscardInstruction(), - isPushUnitInstruction() + isPushUnitInstruction(), + isReturnInstruction() )) ), isLocalStoreInstruction("f") diff --git a/src/test/java/org/shedlang/compiler/stackir/instructions/InstructionMatchers.java b/src/test/java/org/shedlang/compiler/stackir/instructions/InstructionMatchers.java index 7e8a2f4d..8e24e131 100644 --- a/src/test/java/org/shedlang/compiler/stackir/instructions/InstructionMatchers.java +++ b/src/test/java/org/shedlang/compiler/stackir/instructions/InstructionMatchers.java @@ -81,4 +81,10 @@ public class InstructionMatchers { PushUnitInstruction.class ); } + + public static Matcher<Instruction> isReturnInstruction() { + return instanceOf( + ReturnInstruction.class + ); + } } |
