From 340cd24ab948d991c7bb8f062059bf3663c77384 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sun, 18 Jun 2023 12:43:13 +0100
Subject: Remove sourceType from LlvmOperandPtrToInt

---
 src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompiler.java   | 2 --
 .../java/org/shedlang/compiler/backends/llvm/LlvmCompilerStrings.java | 1 -
 .../java/org/shedlang/compiler/backends/llvm/ir/LlvmIrSerializer.java | 4 +---
 .../compiler/backends/llvm/ir/ast/operands/LlvmOperandPtrToInt.java   | 2 --
 4 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'src/main/java')

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 {
-- 
cgit v1.2.3