Update to LLVM 23

6 files changed, 11 insertions, 15 deletions

diff --git a/runtime/i686.meson b/runtime/i686.meson
index 474f958c..f4d2902f 100644
--- a/runtime/i686.meson
+++ b/runtime/i686.meson
@@ -1,7 +1,7 @@
 [binaries]
-c = 'clang-17'
-ld = 'ld-17'
-ar = 'llvm-ar-17'
+c = 'clang-23'
+ld = 'ld-23'
+ar = 'llvm-ar-23'
 strip = 'false'
 
 [built-in options]
diff --git a/runtime/wasm32.meson b/runtime/wasm32.meson
index 2e3225d8..5ba45f7b 100644
--- a/runtime/wasm32.meson
+++ b/runtime/wasm32.meson
@@ -1,7 +1,7 @@
 [binaries]
-c = 'clang-17'
-ld = 'wasm-ld-17'
-ar = 'llvm-ar-17'
+c = 'clang-23'
+ld = 'wasm-ld-23'
+ar = 'llvm-ar-23'
 strip = 'false'
 
 [built-in options]
diff --git a/runtime/wasm64.meson b/runtime/wasm64.meson
index defba1b1..fe1b8dec 100644
--- a/runtime/wasm64.meson
+++ b/runtime/wasm64.meson
@@ -1,7 +1,7 @@
 [binaries]
-c = 'clang-17'
-ld = 'wasm-ld-17'
-ar = 'llvm-ar-17'
+c = 'clang-23'
+ld = 'wasm-ld-23'
+ar = 'llvm-ar-23'
 strip = 'false'
 
 [built-in options]
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 4a2ce026..277b6874 100644
--- a/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompiler.java
+++ b/src/main/java/org/shedlang/compiler/backends/llvm/LlvmCompiler.java
@@ -36,7 +36,7 @@ public class LlvmCompiler {
 
     private static void runLlvmCompiler(Path llvmModulePath, Path objectPath) throws IOException, InterruptedException {
         runInheritIo(List.of(
-            "llc-17", llvmModulePath.toString(),
+            "llc-23", llvmModulePath.toString(),
             "-filetype", "obj",
             "-relocation-model", "pic",
             "-o", objectPath.toString()
diff --git a/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java b/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java
index 27392a0c..c9f47659 100644
--- a/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java
+++ b/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java
@@ -186,10 +186,6 @@ public class PatioToWasm {
 
                 context = generateOperand(patioCallPointer.functionPointer(), context);
 
-                if (context.target == WasmTarget.WASM64) {
-                    context = context.addInstruction(new WasmI32WrapI64());
-                }
-
                 var wasmFuncType = new WasmFuncType(
                     patioOperandsToWasmValueTypes(patioCallPointer.args(), context),
                     List.of(patioOperandToWasmValueType(patioCallPointer.destination(), context))
diff --git a/src/main/java/org/shedlang/compiler/backends/wasm/WasmBackend.java b/src/main/java/org/shedlang/compiler/backends/wasm/WasmBackend.java
index 614bf1fe..7b9411b4 100644
--- a/src/main/java/org/shedlang/compiler/backends/wasm/WasmBackend.java
+++ b/src/main/java/org/shedlang/compiler/backends/wasm/WasmBackend.java
@@ -133,7 +133,7 @@ public class WasmBackend implements Backend {
         ShedRuntime shedRuntime
     ) throws ProcessError, InterruptedException {
         var ldArgs = new ArrayList<String>();
-        ldArgs.add("wasm-ld-17");
+        ldArgs.add("wasm-ld-23");
 
         ldArgs.addAll(this.target.linkerFlags());