diff options
| author | Michael Williamson <mike@zwobble.org> | 2023-06-19 19:11:44 +0100 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2023-06-19 19:11:44 +0100 |
| commit | 4be0a1caf255fa3c1dd86dfc210671b7ae395ebe (patch) | |
| tree | f063e319fd94da91edc00f96764f1129e5a60c8d /src | |
| parent | cdd6065a224cdc623eda83106d6d167504de4f67 (diff) | |
Write directly to file when serializing LLVM IR
Diffstat (limited to 'src')
15 files changed, 235 insertions, 208 deletions
diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmBackend.java b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmBackend.java index c1ff0c95..f26de6dd 100644 --- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmBackend.java +++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmBackend.java @@ -9,6 +9,8 @@ import org.shedlang.compiler.stackir.instructions.Instruction; import org.shedlang.compiler.typechecker.TypeInfo; import org.shedlang.compiler.types.NamespaceName; +import java.io.BufferedWriter; +import java.io.FileWriter; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -63,18 +65,14 @@ public class LlvmBackend implements Backend { Path workingDirectory, String name ) throws IOException { - // TODO: write directly to file - var builder = new StringBuilder(); - LlvmIrSerializer.serializeModule(llvmModule, builder); - var llvmModulePath = workingDirectory.resolve(name + ".ll"); - var objectPath = workingDirectory.resolve(name + ".o"); Files.createDirectories(llvmModulePath.getParent()); - Files.writeString( - llvmModulePath, - builder.toString(), - StandardCharsets.UTF_8 - ); + var fileWriter = new FileWriter(llvmModulePath.toFile(), StandardCharsets.UTF_8); + try (var writer = new BufferedWriter(fileWriter)) { + LlvmIrSerializer.serializeModule(llvmModule, writer); + } + + var objectPath = workingDirectory.resolve(name + ".o"); runLlvmCompiler(llvmModulePath, objectPath); return objectPath; diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializer.java b/src/main/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializer.java index 47032f9f..716deb8a 100644 --- a/src/main/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializer.java +++ b/src/main/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializer.java @@ -5,294 +5,296 @@ import org.shedlang.compiler.backends.llvm.ir.ast.instructions.*; import org.shedlang.compiler.backends.llvm.ir.ast.operands.*; import org.shedlang.compiler.backends.llvm.ir.ast.types.*; +import java.io.IOException; + import static org.shedlang.compiler.util.Iterables.forEachInterspersed; public class LlvmIrSerializer { private LlvmIrSerializer() { } - public static void serializeBasicBlock(LlvmBasicBlock basicBlock, StringBuilder builder) { + public static void serializeBasicBlock(LlvmBasicBlock basicBlock, Appendable writer) throws IOException { if (basicBlock.label().isPresent()) { - builder.append(basicBlock.label().get()); - builder.append(":\n"); + writer.append(basicBlock.label().get()); + writer.append(":\n"); } for (var instruction : basicBlock.instructions()) { - builder.append(" "); - serializeInstruction(instruction, builder); - builder.append("\n"); + writer.append(" "); + serializeInstruction(instruction, writer); + writer.append("\n"); } - builder.append(" "); - serializeTerminatorInstruction(basicBlock.terminator(), builder); - builder.append("\n"); + writer.append(" "); + serializeTerminatorInstruction(basicBlock.terminator(), writer); + writer.append("\n"); } - public static void serializeInstruction(LlvmInstruction instruction, StringBuilder builder) { + public static void serializeInstruction(LlvmInstruction instruction, Appendable writer) throws IOException { switch (instruction) { case LlvmAdd add -> { - serializeVariable(add.target(), builder); - builder.append(" = add "); - serializeType(add.type(), builder); - builder.append(" "); - serializeOperand(add.left(), builder); - builder.append(", "); - serializeOperand(add.right(), builder); + serializeVariable(add.target(), writer); + writer.append(" = add "); + serializeType(add.type(), writer); + writer.append(" "); + serializeOperand(add.left(), writer); + writer.append(", "); + serializeOperand(add.right(), writer); } case LlvmCall call -> { if (call.target().isPresent()) { - serializeVariable(call.target().get(), builder); - builder.append(" = "); + serializeVariable(call.target().get(), writer); + writer.append(" = "); } - builder.append("call "); - serializeType(call.returnType(), builder); - builder.append(" "); - serializeOperand(call.functionPointer(), builder); - builder.append("("); + writer.append("call "); + serializeType(call.returnType(), writer); + writer.append(" "); + serializeOperand(call.functionPointer(), writer); + writer.append("("); forEachInterspersed( call.args(), - arg -> serializeTypedOperand(arg, builder), - () -> builder.append(", ") + arg -> serializeTypedOperand(arg, writer), + () -> writer.append(", ") ); - builder.append(")"); + writer.append(")"); } case LlvmGetElementPtr getElementPtr -> { - serializeVariable(getElementPtr.target(), builder); - builder.append(" = getelementptr "); - serializeType(getElementPtr.pointerType().elementType(), builder); - builder.append(", ptr "); - serializeOperand(getElementPtr.pointer(), builder); + serializeVariable(getElementPtr.target(), writer); + writer.append(" = getelementptr "); + serializeType(getElementPtr.pointerType().elementType(), writer); + writer.append(", ptr "); + serializeOperand(getElementPtr.pointer(), writer); for (var index : getElementPtr.indexes()) { - builder.append(", "); - serializeTypedOperand(index, builder); + writer.append(", "); + serializeTypedOperand(index, writer); } } case LlvmIntToPtr intToPtr -> { - serializeVariable(intToPtr.target(), builder); - builder.append(" = inttoptr "); - serializeType(intToPtr.sourceType(), builder); - builder.append(" "); - serializeOperand(intToPtr.value(), builder); - builder.append(" to ptr"); + serializeVariable(intToPtr.target(), writer); + writer.append(" = inttoptr "); + serializeType(intToPtr.sourceType(), writer); + writer.append(" "); + serializeOperand(intToPtr.value(), writer); + writer.append(" to ptr"); } case LlvmLoad load -> { - serializeVariable(load.target(), builder); - builder.append(" = load "); - serializeType(load.type(), builder); - builder.append(", ptr "); - serializeOperand(load.pointer(), builder); + serializeVariable(load.target(), writer); + writer.append(" = load "); + serializeType(load.type(), writer); + writer.append(", ptr "); + serializeOperand(load.pointer(), writer); } case LlvmPtrToInt ptrToInt -> { - serializeVariable(ptrToInt.target(), builder); - builder.append(" = ptrtoint ptr "); - serializeOperand(ptrToInt.value(), builder); - builder.append(" to "); - serializeType(ptrToInt.targetType(), builder); + serializeVariable(ptrToInt.target(), writer); + writer.append(" = ptrtoint ptr "); + serializeOperand(ptrToInt.value(), writer); + writer.append(" to "); + serializeType(ptrToInt.targetType(), writer); } case LlvmStore store -> { - builder.append("store "); - serializeType(store.type(), builder); - builder.append(" "); - serializeOperand(store.value(), builder); - builder.append(", ptr "); - serializeOperand(store.pointer(), builder); + writer.append("store "); + serializeType(store.type(), writer); + writer.append(" "); + serializeOperand(store.value(), writer); + writer.append(", ptr "); + serializeOperand(store.pointer(), writer); } } } - public static void serializeModule(LlvmModule module, StringBuilder builder) { + public static void serializeModule(LlvmModule module, Appendable writer) throws IOException { for (var topLevelEntity : module.body()) { - serializeTopLevelEntity(topLevelEntity, builder); + serializeTopLevelEntity(topLevelEntity, writer); } } - public static void serializeOperand(LlvmOperand operand, StringBuilder builder) { + public static void serializeOperand(LlvmOperand operand, Appendable writer) throws IOException { switch (operand) { case LlvmOperandArray array -> { - builder.append("["); + writer.append("["); forEachInterspersed( array.elements(), element -> { - serializeType(array.type(), builder); - builder.append(" "); - serializeOperand(element, builder); + serializeType(array.type(), writer); + writer.append(" "); + serializeOperand(element, writer); }, - () -> builder.append(", ") + () -> writer.append(", ") ); - builder.append("]"); + writer.append("]"); } case LlvmOperandInt operandInt -> { - builder.append(operandInt.value()); + writer.append(Long.toString(operandInt.value())); } case LlvmOperandNull operandNull -> { - builder.append("null"); + writer.append("null"); } case LlvmOperandStructure structure -> { - builder.append("{"); + writer.append("{"); forEachInterspersed( structure.elements(), - element -> serializeTypedOperand(element, builder), - () -> builder.append(", ") + element -> serializeTypedOperand(element, writer), + () -> writer.append(", ") ); - builder.append("}"); + writer.append("}"); } case LlvmOperandPtrToInt ptrToInt -> { - builder.append("ptrtoint (ptr "); - serializeOperand(ptrToInt.operand(), builder); - builder.append(" to "); - serializeType(ptrToInt.targetType(), builder); - builder.append(")"); + writer.append("ptrtoint (ptr "); + serializeOperand(ptrToInt.operand(), writer); + writer.append(" to "); + serializeType(ptrToInt.targetType(), writer); + writer.append(")"); } case LlvmVariable variable -> { - serializeVariable(variable, builder); + serializeVariable(variable, writer); } } } - public static void serializeParam(LlvmParam param, StringBuilder builder) { - serializeType(param.type(), builder); - builder.append(" %"); - builder.append(param.name()); + public static void serializeParam(LlvmParam param, Appendable writer) throws IOException { + serializeType(param.type(), writer); + writer.append(" %"); + writer.append(param.name()); } public static void serializeTerminatorInstruction( LlvmTerminatorInstruction instruction, - StringBuilder builder - ) { + Appendable writer + ) throws IOException { switch (instruction) { case LlvmBr br -> { - builder.append("br i1 "); - serializeOperand(br.condition(), builder); - builder.append(", label %"); - builder.append(br.ifTrueLabel()); - builder.append(", label %"); - builder.append(br.ifFalseLabel()); + writer.append("br i1 "); + serializeOperand(br.condition(), writer); + writer.append(", label %"); + writer.append(br.ifTrueLabel()); + writer.append(", label %"); + writer.append(br.ifFalseLabel()); } case LlvmBrUnconditional br -> { - builder.append("br label %"); - builder.append(br.targetLabel()); + writer.append("br label %"); + writer.append(br.targetLabel()); } case LlvmReturn returnValue -> { - builder.append("ret "); - serializeType(returnValue.type(), builder); - builder.append(" "); - serializeOperand(returnValue.value(), builder); + writer.append("ret "); + serializeType(returnValue.type(), writer); + writer.append(" "); + serializeOperand(returnValue.value(), writer); } case LlvmReturnVoid returnVoid -> { - builder.append("ret void"); + writer.append("ret void"); } } } - public static void serializeTopLevelEntity(LlvmTopLevelEntity entity, StringBuilder builder) { + public static void serializeTopLevelEntity(LlvmTopLevelEntity entity, Appendable writer) throws IOException { switch (entity) { case LlvmFunctionDeclaration functionDeclaration -> { - builder.append("declare "); - serializeType(functionDeclaration.returnType(), builder); - builder.append(" @"); - builder.append(functionDeclaration.name()); - builder.append("("); + writer.append("declare "); + serializeType(functionDeclaration.returnType(), writer); + writer.append(" @"); + writer.append(functionDeclaration.name()); + writer.append("("); forEachInterspersed( functionDeclaration.params(), - param -> serializeParam(param, builder), - () -> builder.append(", ") + param -> serializeParam(param, writer), + () -> writer.append(", ") ); - builder.append(")\n"); + writer.append(")\n"); } case LlvmFunctionDefinition functionDefinition -> { - builder.append("define "); - serializeType(functionDefinition.returnType(), builder); - builder.append(" @"); - builder.append(functionDefinition.name()); - builder.append("("); + writer.append("define "); + serializeType(functionDefinition.returnType(), writer); + writer.append(" @"); + writer.append(functionDefinition.name()); + writer.append("("); forEachInterspersed( functionDefinition.params(), - param -> serializeParam(param, builder), - () -> builder.append(", ") + param -> serializeParam(param, writer), + () -> writer.append(", ") ); - builder.append(") {\n"); + writer.append(") {\n"); for (var basicBlock : functionDefinition.body()) { - serializeBasicBlock(basicBlock, builder); + serializeBasicBlock(basicBlock, writer); } - builder.append("}\n"); + writer.append("}\n"); } case LlvmGlobalDefinition globalDefinition -> { - builder.append("@"); - builder.append(globalDefinition.name()); - builder.append(" = "); + writer.append("@"); + writer.append(globalDefinition.name()); + writer.append(" = "); if (globalDefinition.isPrivate()) { - builder.append("private "); + writer.append("private "); } if (globalDefinition.unnamedAddr()) { - builder.append("unnamed_addr "); + writer.append("unnamed_addr "); } if (globalDefinition.value().isEmpty()) { - builder.append("external "); + writer.append("external "); } - builder.append(globalDefinition.constant() ? "constant" : "global"); - builder.append(" "); - serializeType(globalDefinition.type(), builder); + writer.append(globalDefinition.constant() ? "constant" : "global"); + writer.append(" "); + serializeType(globalDefinition.type(), writer); if (globalDefinition.value().isPresent()) { - builder.append(" "); - serializeOperand(globalDefinition.value().get(), builder); + writer.append(" "); + serializeOperand(globalDefinition.value().get(), writer); } - builder.append("\n"); + writer.append("\n"); } } } - public static void serializeType(LlvmType type, StringBuilder builder) { + public static void serializeType(LlvmType type, Appendable writer) throws IOException { switch (type) { case LlvmTypeScalar scalar -> { - builder.append(scalar.name()); + writer.append(scalar.name()); } case LlvmTypeArray array -> { - builder.append("["); - builder.append(array.size().orElse(0)); - builder.append(" x "); - serializeType(array.elementType(), builder); - builder.append("]"); + writer.append("["); + writer.append(Integer.toString(array.size().orElse(0))); + writer.append(" x "); + serializeType(array.elementType(), writer); + writer.append("]"); } case LlvmTypeStructure structure -> { - builder.append("{"); + writer.append("{"); forEachInterspersed( structure.elementTypes(), - elementType -> serializeType(elementType, builder), - () -> builder.append(", ") + elementType -> serializeType(elementType, writer), + () -> writer.append(", ") ); - builder.append("}"); + writer.append("}"); } case LlvmTypePointer pointer -> { - builder.append("ptr"); + writer.append("ptr"); } case LlvmTypeFunction function -> { - serializeType(function.returnType(), builder); - builder.append(" ("); + serializeType(function.returnType(), writer); + writer.append(" ("); forEachInterspersed( function.paramTypes(), - paramType -> serializeType(paramType, builder), - () -> builder.append(", ") + paramType -> serializeType(paramType, writer), + () -> writer.append(", ") ); - builder.append(")"); + writer.append(")"); } } } - public static void serializeTypedOperand(LlvmTypedOperand typedOperand, StringBuilder builder) { - serializeType(typedOperand.type(), builder); - builder.append(" "); - serializeOperand(typedOperand.operand(), builder); + public static void serializeTypedOperand(LlvmTypedOperand typedOperand, Appendable writer) throws IOException { + serializeType(typedOperand.type(), writer); + writer.append(" "); + serializeOperand(typedOperand.operand(), writer); } - public static void serializeVariable(LlvmVariable variable, StringBuilder builder) { + public static void serializeVariable(LlvmVariable variable, Appendable writer) throws IOException { switch (variable) { case LlvmVariableGlobal global -> { - builder.append("@"); - builder.append(global.name()); + writer.append("@"); + writer.append(global.name()); } case LlvmVariableLocal local -> { - builder.append("%"); - builder.append(local.name()); + writer.append("%"); + writer.append(local.name()); } } } diff --git a/src/main/java/org/shedlang/compiler/util/Iterables.java b/src/main/java/org/shedlang/compiler/util/Iterables.java index 6fcb02e1..ff043c13 100644 --- a/src/main/java/org/shedlang/compiler/util/Iterables.java +++ b/src/main/java/org/shedlang/compiler/util/Iterables.java @@ -1,12 +1,22 @@ package org.shedlang.compiler.util; -import java.util.function.Consumer; - public class Iterables { private Iterables() { } - public static <T> void forEachInterspersed(Iterable<T> values, Consumer<T> onElement, Action between) { + public interface OnElement<T, E extends Exception> { + void accept(T value) throws E; + } + + public interface Between<E extends Exception> { + void call() throws E; + } + + public static <T, E extends Exception> void forEachInterspersed( + Iterable<T> values, + OnElement<T, E> onElement, + Between<E> between + ) throws E { var first = true; for (var value : values) { if (!first) { 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 376fac8e..c80787c0 100644 --- a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerDefineFunctionTests.java +++ b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerDefineFunctionTests.java @@ -10,6 +10,7 @@ import org.shedlang.compiler.stackir.instructions.DefineFunctionInstruction; import org.shedlang.compiler.stackir.instructions.Instructions; import org.zwobble.precisely.Matcher; +import java.io.IOException; import java.util.List; import java.util.Map; @@ -20,7 +21,7 @@ import static org.zwobble.precisely.Matchers.*; public class LlvmCompilerDefineFunctionTests { @Test - public void canDefineMinimalFunction() { + public void canDefineMinimalFunction() throws IOException { var instruction = new DefineFunctionInstruction( "f", List.of(), @@ -69,7 +70,7 @@ public class LlvmCompilerDefineFunctionTests { } @Test - public void freeVariablesAreStoredInAndLoadedFromEnvironment() { + public void freeVariablesAreStoredInAndLoadedFromEnvironment() throws IOException { var instruction = new DefineFunctionInstruction( "f", List.of(), diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerBasicBlockTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerBasicBlockTests.java index 2b236994..5d069dae 100644 --- a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerBasicBlockTests.java +++ b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerBasicBlockTests.java @@ -4,6 +4,7 @@ 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 java.io.IOException; import java.util.List; import static org.shedlang.compiler.backends.llvm.ir.LlvmIrSerializerTesting.serializeToString; @@ -12,7 +13,7 @@ import static org.zwobble.precisely.Matchers.equalTo; public class LlvmIrSerializerBasicBlockTests { @Test - public void blockWithoutLabel() { + public void blockWithoutLabel() throws IOException { var basicBlock = LlvmIr.basicBlock( List.of( LlvmIr.add( @@ -37,7 +38,7 @@ public class LlvmIrSerializerBasicBlockTests { } @Test - public void blockWithLabel() { + public void blockWithLabel() throws IOException { var basicBlock = LlvmIr.basicBlock( "start", List.of( diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerFunctionDeclarationTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerFunctionDeclarationTests.java index a33e3283..95a2d1d8 100644 --- a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerFunctionDeclarationTests.java +++ b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerFunctionDeclarationTests.java @@ -5,6 +5,7 @@ import org.shedlang.compiler.backends.llvm.ir.ast.LlvmFunctionDeclaration; import org.shedlang.compiler.backends.llvm.ir.ast.LlvmIr; import org.shedlang.compiler.backends.llvm.ir.ast.types.LlvmTypes; +import java.io.IOException; import java.util.List; import static org.shedlang.compiler.backends.llvm.ir.LlvmIrSerializerTesting.serializeToString; @@ -13,7 +14,7 @@ import static org.zwobble.precisely.Matchers.equalTo; public class LlvmIrSerializerFunctionDeclarationTests { @Test - public void canSerializeFunctionDeclaration() { + public void canSerializeFunctionDeclaration() throws IOException { var definition = new LlvmFunctionDeclaration( "f", LlvmTypes.INT_32, diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerFunctionDefinitionTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerFunctionDefinitionTests.java index fd717764..5157b43a 100644 --- a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerFunctionDefinitionTests.java +++ b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerFunctionDefinitionTests.java @@ -5,6 +5,7 @@ import org.shedlang.compiler.backends.llvm.ir.ast.LlvmFunctionDefinition; import org.shedlang.compiler.backends.llvm.ir.ast.LlvmIr; import org.shedlang.compiler.backends.llvm.ir.ast.types.LlvmTypes; +import java.io.IOException; import java.util.List; import static org.shedlang.compiler.backends.llvm.ir.LlvmIrSerializerTesting.serializeToString; @@ -13,7 +14,7 @@ import static org.zwobble.precisely.Matchers.equalTo; public class LlvmIrSerializerFunctionDefinitionTests { @Test - public void canSerializeFunctionDefinitions() { + public void canSerializeFunctionDefinitions() throws IOException { var definition = new LlvmFunctionDefinition( "f", LlvmTypes.INT_32, diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerGlobalDefinitionTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerGlobalDefinitionTests.java index 85d94127..32e1d8cc 100644 --- a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerGlobalDefinitionTests.java +++ b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerGlobalDefinitionTests.java @@ -5,6 +5,7 @@ import org.shedlang.compiler.backends.llvm.ir.ast.LlvmGlobalDefinition; import org.shedlang.compiler.backends.llvm.ir.ast.LlvmIr; import org.shedlang.compiler.backends.llvm.ir.ast.types.LlvmTypes; +import java.io.IOException; import java.util.Optional; import static org.shedlang.compiler.backends.llvm.ir.LlvmIrSerializerTesting.serializeToString; @@ -13,7 +14,7 @@ import static org.zwobble.precisely.Matchers.equalTo; public class LlvmIrSerializerGlobalDefinitionTests { @Test - public void canSerializeGlobalDefinitionWithTypeAndValue() { + public void canSerializeGlobalDefinitionWithTypeAndValue() throws IOException { var definition = new LlvmGlobalDefinition( "x", LlvmTypes.INT_64, @@ -29,7 +30,7 @@ public class LlvmIrSerializerGlobalDefinitionTests { } @Test - public void canSerializeExternal() { + public void canSerializeExternal() throws IOException { var definition = new LlvmGlobalDefinition( "x", LlvmTypes.INT_64, @@ -45,7 +46,7 @@ public class LlvmIrSerializerGlobalDefinitionTests { } @Test - public void canSerializeConstant() { + public void canSerializeConstant() throws IOException { var definition = new LlvmGlobalDefinition( "x", LlvmTypes.INT_64, @@ -61,7 +62,7 @@ public class LlvmIrSerializerGlobalDefinitionTests { } @Test - public void canSerializePrivate() { + public void canSerializePrivate() throws IOException { var definition = new LlvmGlobalDefinition( "x", LlvmTypes.INT_64, @@ -77,7 +78,7 @@ public class LlvmIrSerializerGlobalDefinitionTests { } @Test - public void canSerializeUnnamedAddr() { + public void canSerializeUnnamedAddr() throws IOException { var definition = new LlvmGlobalDefinition( "x", LlvmTypes.INT_64, diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerInstructionTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerInstructionTests.java index fc4f5e46..ee2be2d4 100644 --- a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerInstructionTests.java +++ b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerInstructionTests.java @@ -4,6 +4,7 @@ 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 java.io.IOException; import java.util.List; import static org.shedlang.compiler.backends.llvm.ir.LlvmIrSerializerTesting.serializeToString; @@ -12,7 +13,7 @@ import static org.zwobble.precisely.Matchers.equalTo; public class LlvmIrSerializerInstructionTests { @Test - public void addIsSerializedWithTypeAndOperands() { + public void addIsSerializedWithTypeAndOperands() throws IOException { var instruction = LlvmIr.add( LlvmIr.variableLocal("x"), LlvmTypes.INT_64, @@ -26,7 +27,7 @@ public class LlvmIrSerializerInstructionTests { } @Test - public void brIsSerializedWithOperandAndLabels() { + public void brIsSerializedWithOperandAndLabels() throws IOException { var instruction = LlvmIr.br( LlvmIr.variableLocal("x"), "ifTrue", @@ -39,7 +40,7 @@ public class LlvmIrSerializerInstructionTests { } @Test - public void brUnconditionIsSerializedWithLabel() { + public void brUnconditionIsSerializedWithLabel() throws IOException { var instruction = LlvmIr.brUnconditional("target"); var result = serializeToString(instruction, LlvmIrSerializer::serializeTerminatorInstruction); @@ -48,7 +49,7 @@ public class LlvmIrSerializerInstructionTests { } @Test - public void canSerializeCallWithNoTargetAndNoArgs() { + public void canSerializeCallWithNoTargetAndNoArgs() throws IOException { var instruction = LlvmIr.call( LlvmTypes.INT_64, LlvmIr.variableLocal("f"), @@ -61,7 +62,7 @@ public class LlvmIrSerializerInstructionTests { } @Test - public void canSerializeCallWithTarget() { + public void canSerializeCallWithTarget() throws IOException { var instruction = LlvmIr.call( LlvmIr.variableLocal("x"), LlvmTypes.INT_64, @@ -75,7 +76,7 @@ public class LlvmIrSerializerInstructionTests { } @Test - public void canSerializeCallWithArgs() { + public void canSerializeCallWithArgs() throws IOException { var instruction = LlvmIr.call( LlvmIr.variableLocal("x"), LlvmTypes.INT_64, @@ -92,7 +93,7 @@ public class LlvmIrSerializerInstructionTests { } @Test - public void getElementPtrIsSerialized() { + public void getElementPtrIsSerialized() throws IOException { var instruction = LlvmIr.getElementPtr( LlvmIr.variableLocal("x"), LlvmTypes.pointer( @@ -114,7 +115,7 @@ public class LlvmIrSerializerInstructionTests { } @Test - public void intToPtrIsSerialized() { + public void intToPtrIsSerialized() throws IOException { var instruction = LlvmIr.intToPtr( LlvmIr.variableLocal("x"), LlvmTypes.INT_64, @@ -127,7 +128,7 @@ public class LlvmIrSerializerInstructionTests { } @Test - public void loadIsSerialized() { + public void loadIsSerialized() throws IOException { var instruction = LlvmIr.load( LlvmIr.variableLocal("target"), LlvmTypes.INT_64, @@ -140,7 +141,7 @@ public class LlvmIrSerializerInstructionTests { } @Test - public void ptrToIntIsSerialized() { + public void ptrToIntIsSerialized() throws IOException { var instruction = LlvmIr.ptrToInt( LlvmIr.variableLocal("x"), LlvmIr.variableLocal("y"), @@ -153,7 +154,7 @@ public class LlvmIrSerializerInstructionTests { } @Test - public void storeIsSerialized() { + public void storeIsSerialized() throws IOException { var instruction = LlvmIr.store( LlvmTypes.INT_64, LlvmIr.operandInt(42), diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerModuleTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerModuleTests.java index c9cf5e95..a66339d0 100644 --- a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerModuleTests.java +++ b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerModuleTests.java @@ -5,6 +5,7 @@ import org.shedlang.compiler.backends.llvm.ir.ast.LlvmGlobalDefinition; import org.shedlang.compiler.backends.llvm.ir.ast.LlvmIr; import org.shedlang.compiler.backends.llvm.ir.ast.types.LlvmTypes; +import java.io.IOException; import java.util.List; import java.util.Optional; @@ -14,7 +15,7 @@ import static org.zwobble.precisely.Matchers.equalTo; public class LlvmIrSerializerModuleTests { @Test - public void canSerializeModules() { + public void canSerializeModules() throws IOException { var module = LlvmIr.module(List.of( new LlvmGlobalDefinition( "x", diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerOperandsTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerOperandsTests.java index eef18100..01de20fc 100644 --- a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerOperandsTests.java +++ b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerOperandsTests.java @@ -4,6 +4,7 @@ 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 java.io.IOException; import java.util.List; import static org.shedlang.compiler.backends.llvm.ir.LlvmIrSerializerTesting.serializeToString; @@ -12,7 +13,7 @@ import static org.zwobble.precisely.Matchers.equalTo; public class LlvmIrSerializerOperandsTests { @Test - public void nullIsSerializedAsNull() { + public void nullIsSerializedAsNull() throws IOException { var operand = LlvmIr.operandNull(); var result = serializeToString(operand, LlvmIrSerializer::serializeOperand); @@ -21,7 +22,7 @@ public class LlvmIrSerializerOperandsTests { } @Test - public void intIsSerializedAsInt() { + public void intIsSerializedAsInt() throws IOException { var operand = LlvmIr.operandInt(42); var result = serializeToString(operand, LlvmIrSerializer::serializeOperand); @@ -30,7 +31,7 @@ public class LlvmIrSerializerOperandsTests { } @Test - public void localVariableIsSerializedWithPercent() { + public void localVariableIsSerializedWithPercent() throws IOException { var operand = LlvmIr.variableLocal("x"); var result = serializeToString(operand, LlvmIrSerializer::serializeVariable); @@ -39,7 +40,7 @@ public class LlvmIrSerializerOperandsTests { } @Test - public void globalVariableIsSerializedWithAt() { + public void globalVariableIsSerializedWithAt() throws IOException { var operand = LlvmIr.variableGlobal("x"); var result = serializeToString(operand, LlvmIrSerializer::serializeVariable); @@ -48,7 +49,7 @@ public class LlvmIrSerializerOperandsTests { } @Test - public void ptrToIntIsSerialized() { + public void ptrToIntIsSerialized() throws IOException { var operand = LlvmIr.operandPtrToInt( LlvmIr.variableLocal("x"), LlvmTypes.INT_64 @@ -60,7 +61,7 @@ public class LlvmIrSerializerOperandsTests { } @Test - public void arrayIsSerializedAsTypedOperandsInArray() { + public void arrayIsSerializedAsTypedOperandsInArray() throws IOException { var operand = LlvmIr.operandArray( LlvmTypes.INT_64, List.of( @@ -76,7 +77,7 @@ public class LlvmIrSerializerOperandsTests { } @Test - public void structureIsSerializedAsElements() { + public void structureIsSerializedAsElements() throws IOException { var operand = LlvmIr.operandStructure( List.of( LlvmIr.typedOperand(LlvmTypes.INT_64, LlvmIr.operandInt(1)), @@ -91,7 +92,7 @@ public class LlvmIrSerializerOperandsTests { } @Test - public void typedOperandHasTypeAndValue() { + public void typedOperandHasTypeAndValue() throws IOException { var operand = LlvmIr.typedOperand(LlvmTypes.INT_64, LlvmIr.operandInt(42)); var result = serializeToString(operand, LlvmIrSerializer::serializeTypedOperand); diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerParamTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerParamTests.java index 650cb713..b48e7ad7 100644 --- a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerParamTests.java +++ b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerParamTests.java @@ -4,13 +4,15 @@ 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 java.io.IOException; + import static org.shedlang.compiler.backends.llvm.ir.LlvmIrSerializerTesting.serializeToString; import static org.zwobble.precisely.AssertThat.assertThat; import static org.zwobble.precisely.Matchers.equalTo; public class LlvmIrSerializerParamTests { @Test - public void paramIsSerializedAsTypeThenName() { + public void paramIsSerializedAsTypeThenName() throws IOException { var param = LlvmIr.param(LlvmTypes.INT_64, "x"); var result = serializeToString(param, LlvmIrSerializer::serializeParam); diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerTerminatorInstructionTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerTerminatorInstructionTests.java index 07946ebd..dc837e8d 100644 --- a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerTerminatorInstructionTests.java +++ b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerTerminatorInstructionTests.java @@ -4,13 +4,15 @@ 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 java.io.IOException; + import static org.shedlang.compiler.backends.llvm.ir.LlvmIrSerializerTesting.serializeToString; import static org.zwobble.precisely.AssertThat.assertThat; import static org.zwobble.precisely.Matchers.equalTo; public class LlvmIrSerializerTerminatorInstructionTests { @Test - public void returnIsSerializedWithTypeAndName() { + public void returnIsSerializedWithTypeAndName() throws IOException { var instruction = LlvmIr.returnValue(LlvmTypes.INT_64, LlvmIr.variableLocal("x")); var result = serializeToString(instruction, LlvmIrSerializer::serializeTerminatorInstruction); @@ -19,7 +21,7 @@ public class LlvmIrSerializerTerminatorInstructionTests { } @Test - public void returnVoidIsSerialized() { + public void returnVoidIsSerialized() throws IOException { var instruction = LlvmIr.returnVoid(); var result = serializeToString(instruction, LlvmIrSerializer::serializeTerminatorInstruction); diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerTesting.java b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerTesting.java index 155d02d2..8aa6cbc8 100644 --- a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerTesting.java +++ b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerTesting.java @@ -1,12 +1,16 @@ package org.shedlang.compiler.backends.llvm.ir; -import java.util.function.BiConsumer; +import java.io.IOException; public class LlvmIrSerializerTesting { private LlvmIrSerializerTesting() { } - public static <T> String serializeToString(T value, BiConsumer<T, StringBuilder> serialize) { + public interface Serializer<T> { + void accept(T value, StringBuilder builder) throws IOException; + } + + public static <T> String serializeToString(T value, Serializer<T> serialize) throws IOException { var builder = new StringBuilder(); serialize.accept(value, builder); return builder.toString(); diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerTypesTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerTypesTests.java index 1850f642..1efee815 100644 --- a/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerTypesTests.java +++ b/src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerTypesTests.java @@ -3,6 +3,7 @@ package org.shedlang.compiler.backends.llvm.ir; import org.junit.jupiter.api.Test; import org.shedlang.compiler.backends.llvm.ir.ast.types.LlvmTypes; +import java.io.IOException; import java.util.List; import static org.shedlang.compiler.backends.llvm.ir.LlvmIrSerializerTesting.serializeToString; @@ -11,7 +12,7 @@ import static org.zwobble.precisely.Matchers.equalTo; public class LlvmIrSerializerTypesTests { @Test - public void scalarTypeIsSerializedToName() { + public void scalarTypeIsSerializedToName() throws IOException { var type = LlvmTypes.INT_64; var result = serializeToString(type, LlvmIrSerializer::serializeType); @@ -20,7 +21,7 @@ public class LlvmIrSerializerTypesTests { } @Test - public void pointerTypeIsSerializedToOpaquePtr() { + public void pointerTypeIsSerializedToOpaquePtr() throws IOException { var type = LlvmTypes.pointer(LlvmTypes.INT_64); var result = serializeToString(type, LlvmIrSerializer::serializeType); @@ -29,7 +30,7 @@ public class LlvmIrSerializerTypesTests { } @Test - public void arrayTypeWithoutSizeIsSerializedToSizeOfZeroAndElementType() { + public void arrayTypeWithoutSizeIsSerializedToSizeOfZeroAndElementType() throws IOException { var type = LlvmTypes.array(LlvmTypes.INT_64); var result = serializeToString(type, LlvmIrSerializer::serializeType); @@ -38,7 +39,7 @@ public class LlvmIrSerializerTypesTests { } @Test - public void arrayTypeWithSizeIsSerializedToSizeAndElementType() { + public void arrayTypeWithSizeIsSerializedToSizeAndElementType() throws IOException { var type = LlvmTypes.array(3, LlvmTypes.INT_64); var result = serializeToString(type, LlvmIrSerializer::serializeType); @@ -47,7 +48,7 @@ public class LlvmIrSerializerTypesTests { } @Test - public void structureTypeIsSerializedToElementTypes() { + public void structureTypeIsSerializedToElementTypes() throws IOException { var type = LlvmTypes.structure(List.of( LlvmTypes.INT_64, LlvmTypes.INT_32 @@ -59,7 +60,7 @@ public class LlvmIrSerializerTypesTests { } @Test - public void canSerializeFunctionType() { + public void canSerializeFunctionType() throws IOException { var type = LlvmTypes.function( LlvmTypes.VOID, List.of( |
