From e6dd7a45fc94075b93a7daadb536ec014ea9f56c Mon Sep 17 00:00:00 2001
From: Elliott Slaughter <slaughter@cs.stanford.edu>
Date: Wed, 19 Jun 2024 13:51:47 -0700
Subject: [PATCH] Test LLVM 18 in CI.

---
 .github/workflows/main.yml | 16 +++++++++++++---
 travis.sh                  |  8 +++++++-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a8f0c2ed..85ad1bf8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         os: ['macos-12', 'windows-2022']
-        llvm: ['11', '12', '13', '14', '15', '16', '17']
+        llvm: ['11', '12', '13', '14', '15', '16', '17', '18']
         cuda: ['0', '1']
         lua: ['luajit', 'moonjit']
         exclude:
@@ -28,7 +28,7 @@ jobs:
           - os: 'macos-12'
             cuda: '1'
 
-          # Windows: exclude LLVM 12-17
+          # Windows: exclude LLVM 12-18
           - os: 'windows-2022'
             llvm: '12'
           - os: 'windows-2022'
@@ -41,6 +41,8 @@ jobs:
             llvm: '16'
           - os: 'windows-2022'
             llvm: '17'
+          - os: 'windows-2022'
+            llvm: '18'
 
           # CUDA: only LLVM 11
           - llvm: '12'
@@ -55,6 +57,8 @@ jobs:
             cuda: '1'
           - llvm: '17'
             cuda: '1'
+          - llvm: '18'
+            cuda: '1'
 
           # Moonjit: only LLVM 12
           - llvm: '11'
@@ -69,6 +73,8 @@ jobs:
             lua: 'moonjit'
           - llvm: '17'
             lua: 'moonjit'
+          - llvm: '18'
+            lua: 'moonjit'
     steps:
       - uses: actions/checkout@v1
       - run: ./travis.sh
@@ -93,7 +99,7 @@ jobs:
     strategy:
       matrix:
         distro: ['ubuntu-18.04']
-        llvm: ['11', '12.0.1', '13.0.1', '14.0.6', '15.0.2', '16.0.3', '17.0.5']
+        llvm: ['11', '12.0.1', '13.0.1', '14.0.6', '15.0.2', '16.0.3', '17.0.5', '18.1.7']
         lua: ['luajit', 'moonjit']
         cuda: ['0', '1']
         test: ['1']
@@ -111,6 +117,8 @@ jobs:
             cuda: '1'
           - llvm: '17.0.5'
             cuda: '1'
+          - llvm: '18.1.7'
+            cuda: '1'
 
           # Moonjit with LLVM 14 only:
           - llvm: '11'
@@ -125,6 +133,8 @@ jobs:
             lua: 'moonjit'
           - llvm: '17.0.5'
             lua: 'moonjit'
+          - llvm: '18.1.7'
+            lua: 'moonjit'
 
         include:
           # Defaults:
diff --git a/travis.sh b/travis.sh
index 1f3704f2..5670ba3e 100755
--- a/travis.sh
+++ b/travis.sh
@@ -33,7 +33,13 @@ if [[ $(uname) = Linux ]]; then
   exit 1
 
 elif [[ $(uname) = Darwin ]]; then
-  if [[ $LLVM_VERSION = 17 ]]; then
+  if [[ $LLVM_VERSION = 18 ]]; then
+    curl -L -O https://github.com/terralang/llvm-build/releases/download/llvm-18.1.7/clang+llvm-18.1.7-x86_64-apple-darwin.tar.xz
+    tar xf clang+llvm-18.1.7-x86_64-apple-darwin.tar.xz
+    ln -s clang+llvm-18.1.7-x86_64-apple-darwin/bin/llvm-config llvm-config-17
+    ln -s clang+llvm-18.1.7-x86_64-apple-darwin/bin/clang clang-17
+    export CMAKE_PREFIX_PATH=$PWD/clang+llvm-18.1.7-x86_64-apple-darwin
+  elif [[ $LLVM_VERSION = 17 ]]; then
     curl -L -O https://github.com/terralang/llvm-build/releases/download/llvm-17.0.5/clang+llvm-17.0.5-x86_64-apple-darwin.tar.xz
     tar xf clang+llvm-17.0.5-x86_64-apple-darwin.tar.xz
     ln -s clang+llvm-17.0.5-x86_64-apple-darwin/bin/llvm-config llvm-config-17