aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2023-06-18 12:43:13 +0100
committerMichael Williamson <mike@zwobble.org>2023-06-18 12:43:13 +0100
commit340cd24ab948d991c7bb8f062059bf3663c77384 (patch)
treec4606c868b54eb05f68affe3f203777e5a786af3 /src
parent63188f20bc0b685b63217f829ef6059fb0b71e58 (diff)
Remove sourceType from LlvmOperandPtrToInt
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompiler.java2
-rw-r--r--src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerStrings.java1
-rw-r--r--src/main/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializer.java4
-rw-r--r--src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/operands/LlvmOperandPtrToInt.java2
-rw-r--r--src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerPushStringTests.java1
-rw-r--r--src/test/java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializerOperandsTests.java1
-rw-r--r--src/test/java/org/shedlang/compiler/backends/llvm/ir/ast/LlvmIr.java2
-rw-r--r--src/test/java/org/shedlang/compiler/backends/llvm/ir/ast/LlvmIrMatchers.java2
8 files changed, 1 insertions, 14 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 143cdd79..db0be392 100644
--- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompiler.java
+++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompiler.java
@@ -87,7 +87,6 @@ public class LlvmCompiler {
context = context.addTerminatorInstruction(new LlvmReturn(
LlvmCompilerTypes.VALUE_TYPE,
new LlvmOperandPtrToInt(
- LlvmCompilerNamespaces.typeNamespacePointer(typeInfo.namespaceTypeInfo(namespaceName)),
LlvmCompilerNamespaces.operandNamespaceValue(namespaceName),
LlvmCompilerTypes.VALUE_TYPE
)
@@ -127,7 +126,6 @@ public class LlvmCompiler {
false
))
.addLocal("print", new LlvmOperandPtrToInt(
- new LlvmCompilerClosures.Types(Optional.of(FreeVariables.empty())).closurePointer(),
new LlvmVariableGlobal("shed__runtime__print_closure"),
LlvmCompilerTypes.VALUE_TYPE
));
diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerStrings.java b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerStrings.java
index b5f94002..f5df0ce4 100644
--- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerStrings.java
+++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompilerStrings.java
@@ -63,7 +63,6 @@ public class LlvmCompilerStrings {
public static LlvmOperand operandAsShedObject(LlvmGlobalDefinition globalDefinition) {
return new LlvmOperandPtrToInt(
- LlvmTypes.pointer(globalDefinition.type()),
new LlvmVariableGlobal(globalDefinition.name()),
LlvmCompilerTypes.VALUE_TYPE
);
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 f0c09051..82433866 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
@@ -134,9 +134,7 @@ public class LlvmIrSerializer {
builder.append("}");
}
case LlvmOperandPtrToInt ptrToInt -> {
- builder.append("ptrtoint (");
- serializeType(ptrToInt.sourceType(), builder);
- builder.append(" ");
+ builder.append("ptrtoint (ptr ");
serializeOperand(ptrToInt.operand(), builder);
builder.append(" to ");
serializeType(ptrToInt.targetType(), builder);
diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/operands/LlvmOperandPtrToInt.java b/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/operands/LlvmOperandPtrToInt.java
index 0eddc061..3d449532 100644
--- a/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/operands/LlvmOperandPtrToInt.java
+++ b/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/operands/LlvmOperandPtrToInt.java
@@ -1,10 +1,8 @@
package org.shedlang.compiler.backends.llvm.ir.ast.operands;
import org.shedlang.compiler.backends.llvm.ir.ast.types.LlvmType;
-import org.shedlang.compiler.backends.llvm.ir.ast.types.LlvmTypePointer;
public record LlvmOperandPtrToInt(
- LlvmTypePointer sourceType,
LlvmOperand operand,
LlvmType targetType
) implements LlvmOperand {
diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerPushStringTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerPushStringTests.java
index b62ac757..761fbd18 100644
--- a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerPushStringTests.java
+++ b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerPushStringTests.java
@@ -23,7 +23,6 @@ public class LlvmCompilerPushStringTests {
assertThat(result.instructions(), isSequence());
assertThat(result.stack(), isSequence(
isLlvmOperandPtrToInt(
- equalTo(LlvmCompilerStrings.typeStringPointer(5)),
isLlvmVariableGlobal("shed__string__0"),
equalTo(LlvmTypes.INT_64)
)
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 06d3f244..eef18100 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
@@ -50,7 +50,6 @@ public class LlvmIrSerializerOperandsTests {
@Test
public void ptrToIntIsSerialized() {
var operand = LlvmIr.operandPtrToInt(
- LlvmTypes.pointer(LlvmTypes.INT_8),
LlvmIr.variableLocal("x"),
LlvmTypes.INT_64
);
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 aab9b812..de778a00 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
@@ -91,12 +91,10 @@ public class LlvmIr {
}
public static LlvmOperand operandPtrToInt(
- LlvmTypePointer sourceType,
LlvmOperand operand,
LlvmType targetType
) {
return new LlvmOperandPtrToInt(
- sourceType,
operand,
targetType
);
diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/ir/ast/LlvmIrMatchers.java b/src/test/java/org/shedlang/compiler/backends/llvm/ir/ast/LlvmIrMatchers.java
index f80746e1..ac52f6c0 100644
--- a/src/test/java/org/shedlang/compiler/backends/llvm/ir/ast/LlvmIrMatchers.java
+++ b/src/test/java/org/shedlang/compiler/backends/llvm/ir/ast/LlvmIrMatchers.java
@@ -32,13 +32,11 @@ public class LlvmIrMatchers {
}
public static Matcher<LlvmOperand> isLlvmOperandPtrToInt(
- Matcher<LlvmType> sourceType,
Matcher<LlvmOperand> operand,
Matcher<LlvmType> targetType
) {
return instanceOf(
LlvmOperandPtrToInt.class,
- has("sourceType", x -> x.sourceType(), sourceType),
has("operand", x -> x.operand(), operand),
has("targetType", x -> x.targetType(), targetType)
);