Support LLVM 16

.github/workflows/llvm.yml

@@ -15,35 +15,46 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        llvm_version: ["13.0.0", "14.0.0", "15.0.6"]
+        include:
+          - llvm_version: "13.0.0"
+            llvm_ubuntu_version: "20.04"
+          - llvm_version: "14.0.0"
+            llvm_ubuntu_version: "18.04"
+          - llvm_version: "15.0.6"
+            llvm_ubuntu_version: "18.04"
+          - llvm_version: "16.0.3"
+            llvm_ubuntu_version: "22.04"
     name: "LLVM ${{ matrix.llvm_version }}"
     steps:
       - name: Checkout Crystal source
         uses: actions/checkout@v3
 
-      - name: Cache LLVM and Clang
+      - name: Cache LLVM
         id: cache-llvm
         uses: actions/cache@v3
         with:
-          path: |
-            C:/Program Files/LLVM
-            ./llvm
+          path: ./llvm
           key: llvm-${{ matrix.llvm_version }}
         if: "${{ !env.ACT }}"
 
-      - uses: KyleMayes/install-llvm-action@13d5d77cbf0bd7e35cb02a8f9ed4bb85bed3393b # v1.8.0
-        with:
-          version: "${{ matrix.llvm_version }}"
-          cached: ${{ steps.cache-llvm.outputs.cache-hit }}
+      - name: Install LLVM ${{ matrix.llvm_version }}
+        run: |
+          mkdir -p llvm
+          curl -L "https://github.com/llvm/llvm-project/releases/download/llvmorg-${{ matrix.llvm_version }}/clang+llvm-${{ matrix.llvm_version }}-x86_64-linux-gnu-ubuntu-${{ matrix.llvm_ubuntu_version }}.tar.xz" > llvm.tar.xz
+          tar x --xz -C llvm --strip-components=1 -f llvm.tar.xz
+        if: steps.cache-llvm.outputs.cache-hit != 'true'
 
-      - name: Set LLVM_CONFIG
-        # LLVM_PATH is set by install-llvm-action
-        run: echo "LLVM_CONFIG=$LLVM_PATH/bin/llvm-config" >> $GITHUB_ENV
+      - name: Set up LLVM
+        run: |
+          sudo apt-get install -y libtinfo5
+          echo "PATH=$(pwd)/llvm/bin:$PATH" >> $GITHUB_ENV
+          echo "LLVM_CONFIG=$(pwd)/llvm/bin/llvm-config" >> $GITHUB_ENV
+          echo "LD_LIBRARY_PATH=$(pwd)/llvm/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
 
       - name: Install Crystal
         uses: crystal-lang/install-crystal@v1
         with:
-          crystal: "1.8.1"
+          crystal: "1.8.2"
 
       - name: Build libllvm_ext
         run: make -B deps

src/llvm/ext/llvm-versions.txt

@@ -1 +1 @@
-15.0 14.0 13.0 12.0 11.1 11.0 10.0 9.0 8.0
+16.0 15.0 14.0 13.0 12.0 11.1 11.0 10.0 9.0 8.0

src/llvm/ext/llvm_ext.cc

@@ -21,6 +21,12 @@ using namespace llvm;
 #include <llvm/Bitcode/BitcodeWriter.h>
 #include <llvm/Analysis/ModuleSummaryAnalysis.h>
 
+#if LLVM_VERSION_GE(16, 0)
+#define makeArrayRef ArrayRef
+#endif
+
+typedef DIBuilder *DIBuilderRef;
+#define DIArray DINodeArray
 template <typename T> T *unwrapDIptr(LLVMMetadataRef v) {
   return (T *)(v ? unwrap<MDNode>(v) : NULL);
 }
@@ -157,7 +163,7 @@ LLVMBool LLVMExtCreateMCJITCompilerForModule(
          .setOptLevel((CodeGenOpt::Level)options.OptLevel)
          .setTargetOptions(targetOptions);
   bool JIT;
-  if (Optional<CodeModel::Model> CM = unwrap(options.CodeModel, JIT))
+  if (auto CM = unwrap(options.CodeModel, JIT))
     builder.setCodeModel(*CM);
   if (options.MCJMM)
     builder.setMCJITMemoryManager(