From 82fffaddf592b59ca87d1fb257ac8693dd0124a7 Mon Sep 17 00:00:00 2001
From: Michal Rostecki <vadorovsky@protonmail.com>
Date: Mon, 20 Mar 2023 16:42:20 +0100
Subject: [PATCH] Update to LLVM 16

Rust recently updated to LLVM 16 (rust-lang/rust#107224) and the change
is likely to be provided in next nightly builds.
---
 .github/workflows/build-test.yml |  6 +++---
 Cargo.lock                       | 17 +++++++++++++++--
 Cargo.toml                       |  2 +-
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 7d18f7a2..19d23526 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -21,7 +21,7 @@ jobs:
           - "stable"
           - "beta"
           - "nightly"
-        llvm: ["15", "rustc"]
+        llvm: ["16", "rustc"]
     name: "rustc: ${{ matrix.rust }}, llvm: ${{ matrix.llvm }}"
 
     env:
@@ -80,9 +80,9 @@ jobs:
         shell: bash
         run: |
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-          echo -e "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main\n" | sudo tee /etc/apt/sources.list.d/llvm.list
+          echo -e "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main\n" | sudo tee /etc/apt/sources.list.d/llvm.list
           sudo apt-get update
-          sudo apt-get install llvm-15-tools
+          sudo apt-get install llvm-16-tools
 
       - name: Build
         run: cargo build --verbose ${CARGO_ARGS}
diff --git a/Cargo.lock b/Cargo.lock
index 9abb3eea..780ffe19 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -66,7 +66,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "libloading",
- "llvm-sys",
+ "llvm-sys 150.0.0",
  "quote 0.6.13",
  "syn 0.15.44",
 ]
@@ -101,7 +101,7 @@ dependencies = [
  "clap",
  "compiletest_rs",
  "libc",
- "llvm-sys",
+ "llvm-sys 160.0.2",
  "log",
  "simplelog",
  "thiserror",
@@ -356,6 +356,19 @@ dependencies = [
  "semver 1.0.9",
 ]
 
+[[package]]
+name = "llvm-sys"
+version = "160.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f28688b1e9d6fa3a00b6dbec62aae91e7dae15abf1f171391691bae4a767dd"
+dependencies = [
+ "cc",
+ "lazy_static",
+ "libc",
+ "regex",
+ "semver 1.0.9",
+]
+
 [[package]]
 name = "log"
 version = "0.4.17"
diff --git a/Cargo.toml b/Cargo.toml
index 3e197c4f..54a314ee 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,7 @@ libc = "0.2"
 thiserror = { version = "1.0", optional = true }
 ar = { version = "0.8", optional = true }
 log = { version = "0.4", optional = true }
-llvm-sys = { version = "150", optional = true }
+llvm-sys = { version = "160", optional = true }
 aya-rustc-llvm-proxy = { version = "0.5.0", optional = true }
 
 [dev-dependencies]