From 58518a3050506d13aed75db159f564db59874581 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 17 Jun 2023 20:47:40 +0100 Subject: Use opaque ptr in inttoptr instructions --- .../org/shedlang/compiler/backends/llvm/LlvmCompilerCallTests.java | 6 ++---- .../compiler/backends/llvm/ir/LlvmIrSerializerInstructionTests.java | 5 ++--- .../java/org/shedlang/compiler/backends/llvm/ir/ast/LlvmIr.java | 5 ++--- 3 files changed, 6 insertions(+), 10 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerCallTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerCallTests.java index c0d9b33c..348fac2e 100644 --- a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerCallTests.java +++ b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerCallTests.java @@ -30,8 +30,7 @@ public class LlvmCompilerCallTests { LlvmIntToPtr.class, has("target", x -> x.target(), isLlvmVariableLocal("closurePointer__0")), has("sourceType", x -> x.sourceType(), equalTo(LlvmCompilerTypes.VALUE_TYPE)), - has("value", x -> x.value(), isLlvmVariableLocal("f")), - has("targetType", x -> x.targetType(), equalTo(LlvmCompilerClosures.CALLABLE_TYPES.closurePointer())) + has("value", x -> x.value(), isLlvmVariableLocal("f")) ), instanceOf( LlvmGetElementPtr.class, @@ -96,8 +95,7 @@ public class LlvmCompilerCallTests { LlvmIntToPtr.class, has("target", x -> x.target(), isLlvmVariableLocal("closurePointer__0")), has("sourceType", x -> x.sourceType(), equalTo(LlvmCompilerTypes.VALUE_TYPE)), - has("value", x -> x.value(), isLlvmVariableLocal("f")), - has("targetType", x -> x.targetType(), equalTo(LlvmCompilerClosures.CALLABLE_TYPES.closurePointer())) + has("value", x -> x.value(), isLlvmVariableLocal("f")) ), instanceOf( LlvmGetElementPtr.class, 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 b210c8d9..f142035e 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 @@ -83,13 +83,12 @@ public class LlvmIrSerializerInstructionTests { var instruction = LlvmIr.intToPtr( LlvmIr.variableLocal("x"), LlvmTypes.INT_64, - LlvmIr.variableLocal("y"), - LlvmTypes.pointer(LlvmTypes.INT_8) + LlvmIr.variableLocal("y") ); var result = serializeToString(instruction, LlvmIrSerializer::serializeInstruction); - assertThat(result, equalTo("%x = inttoptr i64 %y to i8 *")); + assertThat(result, equalTo("%x = inttoptr i64 %y to ptr")); } @Test diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/ir/ast/LlvmIr.java b/src/test/java/org/shedlang/compiler/backends/llvm/ir/ast/LlvmIr.java index 414458fd..aab9b812 100644 --- a/src/test/java/org/shedlang/compiler/backends/llvm/ir/ast/LlvmIr.java +++ b/src/test/java/org/shedlang/compiler/backends/llvm/ir/ast/LlvmIr.java @@ -58,10 +58,9 @@ public class LlvmIr { public static LlvmIntToPtr intToPtr( LlvmVariable target, LlvmTypeScalar sourceType, - LlvmOperand value, - LlvmTypePointer targetType + LlvmOperand value ) { - return new LlvmIntToPtr(target, sourceType, value, targetType); + return new LlvmIntToPtr(target, sourceType, value); } public static LlvmLoad load( -- cgit v1.2.3