From 109eb835082418d55b099301e151a7d9331135e0 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Wed, 8 Apr 2026 18:48:57 +0100
Subject: Add extractvalue instruction to LLVM IR

---
 .../compiler/backends/llvm/ir/LlvmIrSerializer.java     | 13 +++++++++++++
 .../llvm/ir/ast/instructions/LlvmExtractValue.java      | 15 +++++++++++++++
 .../llvm/ir/ast/instructions/LlvmInstruction.java       |  2 +-
 .../llvm/ir/LlvmIrSerializerInstructionTests.java       | 17 +++++++++++++++++
 .../shedlang/compiler/backends/llvm/ir/ast/LlvmIr.java  |  9 +++++++++
 5 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmExtractValue.java

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 7106a192..b2f3f7b6 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
@@ -75,6 +75,19 @@ public class LlvmIrSerializer {
                 );
                 writer.append(")");
             }
+
+            case LlvmExtractValue extractValue -> {
+                serializeVariable(extractValue.destination(), writer);
+                writer.append(" = extractvalue ");
+                serializeType(extractValue.aggregateType(), writer);
+                writer.append(" ");
+                serializeOperand(extractValue.aggregate(), writer);
+                for (var index : extractValue.indexes()) {
+                    writer.append(", ");
+                    writer.append(index.toString());
+                }
+            }
+
             case LlvmGetElementPtr getElementPtr -> {
                 serializeVariable(getElementPtr.destination(), writer);
                 writer.append(" = getelementptr ");
diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmExtractValue.java b/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmExtractValue.java
new file mode 100644
index 00000000..1f4d7aad
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmExtractValue.java
@@ -0,0 +1,15 @@
+package org.shedlang.compiler.backends.llvm.ir.ast.instructions;
+
+import org.shedlang.compiler.backends.llvm.ir.ast.operands.LlvmOperand;
+import org.shedlang.compiler.backends.llvm.ir.ast.operands.LlvmVariable;
+import org.shedlang.compiler.backends.llvm.ir.ast.types.LlvmType;
+
+import java.util.List;
+
+public record LlvmExtractValue(
+    LlvmVariable destination,
+    LlvmType aggregateType,
+    LlvmOperand aggregate,
+    List<Integer> indexes
+) implements LlvmInstruction {
+}
diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmInstruction.java b/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmInstruction.java
index 57bccf19..a8467bf9 100644
--- a/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmInstruction.java
+++ b/src/main/java/org/shedlang/compiler/backends/llvm/ir/ast/instructions/LlvmInstruction.java
@@ -1,4 +1,4 @@
 package org.shedlang.compiler.backends.llvm.ir.ast.instructions;
 
-public sealed interface LlvmInstruction permits LlvmAdd, LlvmAlloca, LlvmCall, LlvmGetElementPtr, LlvmIcmp, LlvmIntToPtr, LlvmLoad, LlvmPhi, LlvmPtrToInt, LlvmStore, LlvmSub, LlvmTrunc, LlvmZext {
+public sealed interface LlvmInstruction permits LlvmAdd, LlvmAlloca, LlvmCall, LlvmExtractValue, LlvmGetElementPtr, LlvmIcmp, LlvmIntToPtr, LlvmLoad, LlvmPhi, LlvmPtrToInt, LlvmStore, LlvmSub, LlvmTrunc, LlvmZext {
 }
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 06d773d1..6c0123e0 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
@@ -105,6 +105,23 @@ public class LlvmIrSerializerInstructionTests {
         assertThat(result, equalTo("%x = call i64 %f(i64 %y, i32 %z)"));
     }
 
+    @Test
+    public void extractValueIsSerialized() throws IOException {
+        var instruction = LlvmIr.extractValue(
+            LlvmIr.variableLocal("x"),
+            LlvmTypes.array(
+                10,
+                LlvmTypes.structure(List.of(LlvmTypes.INT_64, LlvmTypes.INT_32))
+            ),
+            LlvmIr.variableLocal("y"),
+            List.of(3, 1)
+        );
+
+        var result = serializeToString(instruction, LlvmIrSerializer::serializeInstruction);
+
+        assertThat(result, equalTo("%x = extractvalue [10 x {i64, i32}] %y, 3, 1"));
+    }
+
     @Test
     public void getElementPtrIsSerialized() throws IOException {
         var instruction = LlvmIr.getElementPtr(
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 a435877b..7e771717 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
@@ -74,6 +74,15 @@ public class LlvmIr {
         return new LlvmCall(destination, returnType, functionPointer, args);
     }
 
+    public static LlvmExtractValue extractValue(
+        LlvmVariable destination,
+        LlvmType aggregateType,
+        LlvmOperand aggregate,
+        List<Integer> indexes
+    ) {
+        return new LlvmExtractValue(destination, aggregateType, aggregate, indexes);
+    }
+
     public static LlvmGetElementPtr getElementPtr(
         LlvmVariable destination,
         LlvmTypePointer pointerType,
-- 
cgit v1.2.3