From 52c7085ffe7fca966607efcda21737fc384dcd48 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Fri, 25 Oct 2024 10:38:20 -0700
Subject: [PATCH] Update to Rust 1.81.0

Related: RHEL-61964
---
 .gitignore                                    |   3 +
 ...ssue-122805.rs-big-endian-compatible.patch |  49 --
 ...-an-automatic-SONAME-for-Rust-dylibs.patch | 234 ++++++++
 0001-Use-lld-provided-by-system.patch         |  77 +--
 ...llow-disabling-target-self-contained.patch |  26 +-
 ...-handle-no_std-targets-on-std-builds.patch | 103 ++++
 ...xternal-library-path-for-wasm32-wasi.patch |  26 +-
 rust.spec                                     |  53 +-
 rustc-1.81.0-Update-to-LLVM-19.patch          | 560 ++++++++++++++++++
 ...atch => rustc-1.81.0-disable-libssh2.patch |  20 +-
 ...atch => rustc-1.81.0-unbundle-sqlite.patch |  12 +-
 sources                                       |   4 +-
 12 files changed, 1022 insertions(+), 145 deletions(-)
 delete mode 100644 0001-Make-issue-122805.rs-big-endian-compatible.patch
 create mode 100644 0001-Only-add-an-automatic-SONAME-for-Rust-dylibs.patch
 create mode 100644 0001-handle-no_std-targets-on-std-builds.patch
 create mode 100644 rustc-1.81.0-Update-to-LLVM-19.patch
 rename rustc-1.80.0-disable-libssh2.patch => rustc-1.81.0-disable-libssh2.patch (54%)
 rename rustc-1.80.0-unbundle-sqlite.patch => rustc-1.81.0-unbundle-sqlite.patch (61%)

diff --git a/.gitignore b/.gitignore
index f175f22..6c1f2b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -420,3 +420,6 @@
 /wasi-libc-wasi-sdk-22.tar.gz
 /rustc-1.80.0-src.tar.xz
 /rustc-1.80.1-src.tar.xz
+/wasi-libc-3f43ea9abb24ed8d24d760989e1d87ea385f8eaa.tar.gz
+/rustc-1.81.0-src.tar.xz
+/wasi-libc-b9ef79d7dbd47c6c5bafdae760823467c2f60b70.tar.gz
diff --git a/0001-Make-issue-122805.rs-big-endian-compatible.patch b/0001-Make-issue-122805.rs-big-endian-compatible.patch
deleted file mode 100644
index 23d9a86..0000000
--- a/0001-Make-issue-122805.rs-big-endian-compatible.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 26fa5c2c300f3c3a3ee3109c009bd4a6803a2a4c Mon Sep 17 00:00:00 2001
-From: Nikita Popov <npopov@redhat.com>
-Date: Tue, 11 Jun 2024 10:13:07 +0200
-Subject: [PATCH] Make issue-122805.rs big endian compatible
-
-Instead of not generating the function at all on big endian (which
-makes the CHECK lines fail), instead use to_le() on big endian,
-so that we essentially perform a bswap for both endiannesses.
----
- tests/codegen/issues/issue-122805.rs | 21 ++++++++++++---------
- 1 file changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/tests/codegen/issues/issue-122805.rs b/tests/codegen/issues/issue-122805.rs
-index 6d108ada6dd..8e03c6c8884 100644
---- a/tests/codegen/issues/issue-122805.rs
-+++ b/tests/codegen/issues/issue-122805.rs
-@@ -39,17 +39,20 @@
- // OPT3WINX64-NEXT: store <8 x i16>
- // CHECK-NEXT: ret void
- #[no_mangle]
--#[cfg(target_endian = "little")]
- pub fn convert(value: [u16; 8]) -> [u8; 16] {
-+    #[cfg(target_endian = "little")]
-+    let bswap = u16::to_be;
-+    #[cfg(target_endian = "big")]
-+    let bswap = u16::to_le;
-     let addr16 = [
--        value[0].to_be(),
--        value[1].to_be(),
--        value[2].to_be(),
--        value[3].to_be(),
--        value[4].to_be(),
--        value[5].to_be(),
--        value[6].to_be(),
--        value[7].to_be(),
-+        bswap(value[0]),
-+        bswap(value[1]),
-+        bswap(value[2]),
-+        bswap(value[3]),
-+        bswap(value[4]),
-+        bswap(value[5]),
-+        bswap(value[6]),
-+        bswap(value[7]),
-     ];
-     unsafe { core::mem::transmute::<_, [u8; 16]>(addr16) }
- }
--- 
-2.45.1
-
diff --git a/0001-Only-add-an-automatic-SONAME-for-Rust-dylibs.patch b/0001-Only-add-an-automatic-SONAME-for-Rust-dylibs.patch
new file mode 100644
index 0000000..80970d1
--- /dev/null
+++ b/0001-Only-add-an-automatic-SONAME-for-Rust-dylibs.patch
@@ -0,0 +1,234 @@
+From f46057bf1cc0dc24a0ecd7d87c9c93872e685253 Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Fri, 27 Sep 2024 15:53:26 -0700
+Subject: [PATCH] Only add an automatic SONAME for Rust dylibs
+
+---
+ compiler/rustc_codegen_ssa/src/back/link.rs   |  2 +-
+ compiler/rustc_codegen_ssa/src/back/linker.rs | 83 +++++++++++++++----
+ tests/run-make/dylib-soname/rmake.rs          | 16 ++--
+ 3 files changed, 80 insertions(+), 21 deletions(-)
+
+diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
+index 80e8111516ee..a23cc5129261 100644
+--- a/compiler/rustc_codegen_ssa/src/back/link.rs
++++ b/compiler/rustc_codegen_ssa/src/back/link.rs
+@@ -2490,7 +2490,7 @@ fn add_order_independent_options(
+         }
+     }
+ 
+-    cmd.set_output_kind(link_output_kind, out_filename);
++    cmd.set_output_kind(link_output_kind, crate_type, out_filename);
+ 
+     add_relro_args(cmd, sess);
+ 
+diff --git a/compiler/rustc_codegen_ssa/src/back/linker.rs b/compiler/rustc_codegen_ssa/src/back/linker.rs
+index a73ec83ee62c..3f3d305da014 100644
+--- a/compiler/rustc_codegen_ssa/src/back/linker.rs
++++ b/compiler/rustc_codegen_ssa/src/back/linker.rs
+@@ -275,7 +275,12 @@ pub(crate) trait Linker {
+     fn is_cc(&self) -> bool {
+         false
+     }
+-    fn set_output_kind(&mut self, output_kind: LinkOutputKind, out_filename: &Path);
++    fn set_output_kind(
++        &mut self,
++        output_kind: LinkOutputKind,
++        crate_type: CrateType,
++        out_filename: &Path,
++    );
+     fn link_dylib_by_name(&mut self, _name: &str, _verbatim: bool, _as_needed: bool) {
+         bug!("dylib linked with unsupported linker")
+     }
+@@ -396,7 +401,7 @@ fn push_linker_plugin_lto_args(&mut self, plugin_path: Option<&OsStr>) {
+         ]);
+     }
+ 
+-    fn build_dylib(&mut self, out_filename: &Path) {
++    fn build_dylib(&mut self, crate_type: CrateType, out_filename: &Path) {
+         // On mac we need to tell the linker to let this library be rpathed
+         if self.sess.target.is_like_osx {
+             if !self.is_ld {
+@@ -427,7 +432,7 @@ fn build_dylib(&mut self, out_filename: &Path) {
+                     let mut out_implib = OsString::from("--out-implib=");
+                     out_implib.push(out_filename.with_file_name(implib_name));
+                     self.link_arg(out_implib);
+-                } else {
++                } else if crate_type == CrateType::Dylib {
+                     // When dylibs are linked by a full path this value will get into `DT_NEEDED`
+                     // instead of the full path, so the library can be later found in some other
+                     // location than that specific path.
+@@ -474,7 +479,12 @@ fn is_cc(&self) -> bool {
+         !self.is_ld
+     }
+ 
+-    fn set_output_kind(&mut self, output_kind: LinkOutputKind, out_filename: &Path) {
++    fn set_output_kind(
++        &mut self,
++        output_kind: LinkOutputKind,
++        crate_type: CrateType,
++        out_filename: &Path,
++    ) {
+         match output_kind {
+             LinkOutputKind::DynamicNoPicExe => {
+                 if !self.is_ld && self.is_gnu {
+@@ -509,10 +519,10 @@ fn set_output_kind(&mut self, output_kind: LinkOutputKind, out_filename: &Path)
+                     self.link_args(&["-static", "-pie", "--no-dynamic-linker", "-z", "text"]);
+                 }
+             }
+-            LinkOutputKind::DynamicDylib => self.build_dylib(out_filename),
++            LinkOutputKind::DynamicDylib => self.build_dylib(crate_type, out_filename),
+             LinkOutputKind::StaticDylib => {
+                 self.link_or_cc_arg("-static");
+-                self.build_dylib(out_filename);
++                self.build_dylib(crate_type, out_filename);
+             }
+             LinkOutputKind::WasiReactorExe => {
+                 self.link_args(&["--entry", "_initialize"]);
+@@ -866,7 +876,12 @@ fn cmd(&mut self) -> &mut Command {
+         &mut self.cmd
+     }
+ 
+-    fn set_output_kind(&mut self, output_kind: LinkOutputKind, out_filename: &Path) {
++    fn set_output_kind(
++        &mut self,
++        output_kind: LinkOutputKind,
++        _crate_type: CrateType,
++        out_filename: &Path,
++    ) {
+         match output_kind {
+             LinkOutputKind::DynamicNoPicExe
+             | LinkOutputKind::DynamicPicExe
+@@ -1124,7 +1139,13 @@ fn is_cc(&self) -> bool {
+         true
+     }
+ 
+-    fn set_output_kind(&mut self, _output_kind: LinkOutputKind, _out_filename: &Path) {}
++    fn set_output_kind(
++        &mut self,
++        _output_kind: LinkOutputKind,
++        _crate_type: CrateType,
++        _out_filename: &Path,
++    ) {
++    }
+ 
+     fn link_dylib_by_name(&mut self, name: &str, _verbatim: bool, _as_needed: bool) {
+         // Emscripten always links statically
+@@ -1273,7 +1294,12 @@ fn cmd(&mut self) -> &mut Command {
+         &mut self.cmd
+     }
+ 
+-    fn set_output_kind(&mut self, output_kind: LinkOutputKind, _out_filename: &Path) {
++    fn set_output_kind(
++        &mut self,
++        output_kind: LinkOutputKind,
++        _crate_type: CrateType,
++        _out_filename: &Path,
++    ) {
+         match output_kind {
+             LinkOutputKind::DynamicNoPicExe
+             | LinkOutputKind::DynamicPicExe
+@@ -1422,7 +1448,13 @@ fn cmd(&mut self) -> &mut Command {
+         &mut self.cmd
+     }
+ 
+-    fn set_output_kind(&mut self, _output_kind: LinkOutputKind, _out_filename: &Path) {}
++    fn set_output_kind(
++        &mut self,
++        _output_kind: LinkOutputKind,
++        _crate_type: CrateType,
++        _out_filename: &Path,
++    ) {
++    }
+ 
+     fn link_staticlib_by_name(&mut self, name: &str, _verbatim: bool, whole_archive: bool) {
+         self.hint_static();
+@@ -1568,7 +1600,12 @@ fn cmd(&mut self) -> &mut Command {
+         &mut self.cmd
+     }
+ 
+-    fn set_output_kind(&mut self, output_kind: LinkOutputKind, out_filename: &Path) {
++    fn set_output_kind(
++        &mut self,
++        output_kind: LinkOutputKind,
++        _crate_type: CrateType,
++        out_filename: &Path,
++    ) {
+         match output_kind {
+             LinkOutputKind::DynamicDylib => {
+                 self.hint_dynamic();
+@@ -1775,7 +1812,13 @@ fn cmd(&mut self) -> &mut Command {
+         &mut self.cmd
+     }
+ 
+-    fn set_output_kind(&mut self, _output_kind: LinkOutputKind, _out_filename: &Path) {}
++    fn set_output_kind(
++        &mut self,
++        _output_kind: LinkOutputKind,
++        _crate_type: CrateType,
++        _out_filename: &Path,
++    ) {
++    }
+ 
+     fn link_staticlib_by_name(&mut self, _name: &str, _verbatim: bool, _whole_archive: bool) {
+         panic!("staticlibs not supported")
+@@ -1841,7 +1884,13 @@ fn cmd(&mut self) -> &mut Command {
+         &mut self.cmd
+     }
+ 
+-    fn set_output_kind(&mut self, _output_kind: LinkOutputKind, _out_filename: &Path) {}
++    fn set_output_kind(
++        &mut self,
++        _output_kind: LinkOutputKind,
++        _crate_type: CrateType,
++        _out_filename: &Path,
++    ) {
++    }
+ 
+     fn link_staticlib_by_name(&mut self, _name: &str, _verbatim: bool, _whole_archive: bool) {
+         panic!("staticlibs not supported")
+@@ -1912,7 +1961,13 @@ fn cmd(&mut self) -> &mut Command {
+         &mut self.cmd
+     }
+ 
+-    fn set_output_kind(&mut self, _output_kind: LinkOutputKind, _out_filename: &Path) {}
++    fn set_output_kind(
++        &mut self,
++        _output_kind: LinkOutputKind,
++        _crate_type: CrateType,
++        _out_filename: &Path,
++    ) {
++    }
+ 
+     fn link_staticlib_by_name(&mut self, _name: &str, _verbatim: bool, _whole_archive: bool) {
+         panic!("staticlibs not supported")
+diff --git a/tests/run-make/dylib-soname/rmake.rs b/tests/run-make/dylib-soname/rmake.rs
+index cec0d4638424..714997cbc1a1 100644
+--- a/tests/run-make/dylib-soname/rmake.rs
++++ b/tests/run-make/dylib-soname/rmake.rs
+@@ -7,12 +7,16 @@
+ use run_make_support::{cmd, run_in_tmpdir, rustc};
+ 
+ fn main() {
++    let check = |ty: &str| {
++        rustc().crate_name("foo").crate_type(ty).input("foo.rs").run();
++        cmd("readelf").arg("-d").arg("libfoo.so").run()
++    };
+     run_in_tmpdir(|| {
+-        rustc().crate_name("foo").crate_type("dylib").input("foo.rs").run();
+-        cmd("readelf")
+-            .arg("-d")
+-            .arg("libfoo.so")
+-            .run()
+-            .assert_stdout_contains("Library soname: [libfoo.so]");
++        // Rust dylibs should get a relative SONAME
++        check("dylib").assert_stdout_contains("Library soname: [libfoo.so]");
++    });
++    run_in_tmpdir(|| {
++        // C dylibs should not implicitly get any SONAME
++        check("cdylib").assert_stdout_not_contains("Library soname:");
+     });
+ }
+-- 
+2.46.1
+
diff --git a/0001-Use-lld-provided-by-system.patch b/0001-Use-lld-provided-by-system.patch
index d5970bd..063d66a 100644
--- a/0001-Use-lld-provided-by-system.patch
+++ b/0001-Use-lld-provided-by-system.patch
@@ -1,19 +1,21 @@
-From 61b5cc96337da2121221dd1bcdb63fd36551d065 Mon Sep 17 00:00:00 2001
+From 3d8c6d095581e8d7585f3772cfd16f6367f3c008 Mon Sep 17 00:00:00 2001
 From: Josh Stone <jistone@redhat.com>
-Date: Wed, 1 Nov 2023 15:21:15 -0700
+Date: Fri, 16 Aug 2024 10:12:58 -0700
 Subject: [PATCH] Use lld provided by system
 
 ---
- compiler/rustc_target/src/spec/base/wasm.rs                   | 3 +--
- compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs | 2 +-
- compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs | 1 +
- 3 files changed, 3 insertions(+), 3 deletions(-)
+ compiler/rustc_target/src/spec/base/wasm.rs                    | 3 +--
+ .../src/spec/targets/aarch64_unknown_none_softfloat.rs         | 2 +-
+ compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs | 1 +
+ compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs  | 2 +-
+ compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs  | 1 +
+ 5 files changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/compiler/rustc_target/src/spec/base/wasm.rs b/compiler/rustc_target/src/spec/base/wasm.rs
-index 87ade9e58cf4..2ddff95febab 100644
+index f237391016e7..08bcd9699b4a 100644
 --- a/compiler/rustc_target/src/spec/base/wasm.rs
 +++ b/compiler/rustc_target/src/spec/base/wasm.rs
-@@ -91,8 +91,7 @@ macro_rules! args {
+@@ -85,8 +85,7 @@ macro_rules! args {
          // arguments just yet
          limit_rdylib_exports: false,
  
@@ -23,8 +25,33 @@ index 87ade9e58cf4..2ddff95febab 100644
          linker_flavor: LinkerFlavor::WasmLld(Cc::No),
  
          pre_link_args,
+diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
+index 222d5651b521..4b780bc8a8e7 100644
+--- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
++++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
+@@ -14,7 +14,7 @@ pub fn target() -> Target {
+     let opts = TargetOptions {
+         abi: "softfloat".into(),
+         linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
+-        linker: Some("rust-lld".into()),
++        linker: Some("lld".into()),
+         features: "+v8a,+strict-align,-neon,-fp-armv8".into(),
+         relocation_model: RelocModel::Static,
+         disable_redzone: true,
+diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
+index 429303170b6b..19d4ec53f6d8 100644
+--- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
++++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
+@@ -9,6 +9,7 @@ pub fn target() -> Target {
+     base.max_atomic_width = Some(128);
+     base.add_pre_link_args(LinkerFlavor::Msvc(Lld::No), &["/machine:arm64"]);
+     base.features = "+v8a".into();
++    base.linker = Some("lld".into());
+ 
+     Target {
+         llvm_target: "aarch64-unknown-windows".into(),
 diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
-index 9aa95a35f8e5..a9172f9441b7 100644
+index 549706998d46..b7e9158ddef5 100644
 --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
 +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
 @@ -17,7 +17,7 @@ pub fn target() -> Target {
@@ -33,11 +60,11 @@ index 9aa95a35f8e5..a9172f9441b7 100644
          linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
 -        linker: Some("rust-lld".into()),
 +        linker: Some("lld".into()),
-         features:
-             "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-3dnow,-3dnowa,-avx,-avx2,+soft-float"
-                 .into(),
+         features: "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2,+soft-float".into(),
+         supported_sanitizers: SanitizerSet::KCFI | SanitizerSet::KERNELADDRESS,
+         disable_redzone: true,
 diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
-index 5abfb8162f70..13cb43bda1a4 100644
+index 6da1fcca58c8..c84ae44576d4 100644
 --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
 +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
 @@ -16,6 +16,7 @@ pub fn target() -> Target {
@@ -48,28 +75,6 @@ index 5abfb8162f70..13cb43bda1a4 100644
  
      // We disable MMX and SSE for now, even though UEFI allows using them. Problem is, you have to
      // enable these CPU features explicitly before their first use, otherwise their instructions
-diff -Naur a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
---- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs	2024-03-17 12:03:00.000000000 -0700
-+++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs	2024-03-22 10:02:17.742806274 -0700
-@@ -14,7 +14,7 @@
-     let opts = TargetOptions {
-         abi: "softfloat".into(),
-         linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
--        linker: Some("rust-lld".into()),
-+        linker: Some("lld".into()),
-         features: "+v8a,+strict-align,-neon,-fp-armv8".into(),
-         relocation_model: RelocModel::Static,
-         disable_redzone: true,
 -- 
-2.41.0
+2.46.0
 
---- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs	2024-04-09 19:20:09.000000000 +0200
-+++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs	2024-04-26 11:22:31.988601550 +0200
-@@ -9,6 +9,7 @@ pub fn target() -> Target {
-     base.max_atomic_width = Some(128);
-     base.add_pre_link_args(LinkerFlavor::Msvc(Lld::No), &["/machine:arm64"]);
-     base.features = "+v8a".into();
-+    base.linker = Some("lld".into());
- 
-     Target {
-         llvm_target: "aarch64-unknown-windows".into(),
diff --git a/0001-bootstrap-allow-disabling-target-self-contained.patch b/0001-bootstrap-allow-disabling-target-self-contained.patch
index a168218..4913cd8 100644
--- a/0001-bootstrap-allow-disabling-target-self-contained.patch
+++ b/0001-bootstrap-allow-disabling-target-self-contained.patch
@@ -1,4 +1,4 @@
-From 2b99134e2884fa56bcab6d360885ec5421048e66 Mon Sep 17 00:00:00 2001
+From 937b23ef51b1d2f3d12adc9bd90dfd27936326dd Mon Sep 17 00:00:00 2001
 From: Josh Stone <jistone@redhat.com>
 Date: Thu, 28 Sep 2023 18:14:28 -0700
 Subject: [PATCH 1/2] bootstrap: allow disabling target self-contained
@@ -11,10 +11,10 @@ Subject: [PATCH 1/2] bootstrap: allow disabling target self-contained
  4 files changed, 22 insertions(+)
 
 diff --git a/config.example.toml b/config.example.toml
-index f94553dd63f7..5ec969c80a37 100644
+index 26687bcfb370..381a23f9cead 100644
 --- a/config.example.toml
 +++ b/config.example.toml
-@@ -869,6 +869,11 @@
+@@ -872,6 +872,11 @@
  # argument as the test binary.
  #runner = <none> (string)
  
@@ -27,10 +27,10 @@ index f94553dd63f7..5ec969c80a37 100644
  # Distribution options
  #
 diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
-index e927b491c71e..69a80d01d6b9 100644
+index 3e79acad1c4b..525b6e956405 100644
 --- a/src/bootstrap/src/core/build_steps/compile.rs
 +++ b/src/bootstrap/src/core/build_steps/compile.rs
-@@ -356,6 +356,10 @@ fn copy_self_contained_objects(
+@@ -357,6 +357,10 @@ fn copy_self_contained_objects(
      compiler: &Compiler,
      target: TargetSelection,
  ) -> Vec<(PathBuf, DependencyType)> {
@@ -42,10 +42,10 @@ index e927b491c71e..69a80d01d6b9 100644
      t!(fs::create_dir_all(&libdir_self_contained));
      let mut target_deps = vec![];
 diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
-index 3e1bc9a9acdd..5e24a9cc4f60 100644
+index 9d5aa795c6c0..720dc53514d3 100644
 --- a/src/bootstrap/src/core/config/config.rs
 +++ b/src/bootstrap/src/core/config/config.rs
-@@ -586,6 +586,7 @@ pub struct Target {
+@@ -565,6 +565,7 @@ pub struct Target {
      pub runner: Option<String>,
      pub no_std: bool,
      pub codegen_backends: Option<Vec<String>>,
@@ -53,7 +53,7 @@ index 3e1bc9a9acdd..5e24a9cc4f60 100644
  }
  
  impl Target {
-@@ -594,6 +595,9 @@ pub fn from_triple(triple: &str) -> Self {
+@@ -573,6 +574,9 @@ pub fn from_triple(triple: &str) -> Self {
          if triple.contains("-none") || triple.contains("nvptx") || triple.contains("switch") {
              target.no_std = true;
          }
@@ -63,7 +63,7 @@ index 3e1bc9a9acdd..5e24a9cc4f60 100644
          target
      }
  }
-@@ -1150,6 +1154,7 @@ struct TomlTarget {
+@@ -1140,6 +1144,7 @@ struct TomlTarget {
          no_std: Option<bool> = "no-std",
          codegen_backends: Option<Vec<String>> = "codegen-backends",
          runner: Option<String> = "runner",
@@ -71,7 +71,7 @@ index 3e1bc9a9acdd..5e24a9cc4f60 100644
      }
  }
  
-@@ -1870,6 +1875,9 @@ fn get_table(option: &str) -> Result<TomlConfig, toml::de::Error> {
+@@ -1900,6 +1905,9 @@ fn get_table(option: &str) -> Result<TomlConfig, toml::de::Error> {
                  if let Some(s) = cfg.no_std {
                      target.no_std = s;
                  }
@@ -82,10 +82,10 @@ index 3e1bc9a9acdd..5e24a9cc4f60 100644
                  target.cxx = cfg.cxx.map(PathBuf::from);
                  target.ar = cfg.ar.map(PathBuf::from);
 diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
-index 5ed6b357e20a..c23b21d65713 100644
+index a8555b2c3673..70c41b51eb96 100644
 --- a/src/bootstrap/src/lib.rs
 +++ b/src/bootstrap/src/lib.rs
-@@ -1348,6 +1348,11 @@ fn no_std(&self, target: TargetSelection) -> Option<bool> {
+@@ -1361,6 +1361,11 @@ fn no_std(&self, target: TargetSelection) -> Option<bool> {
          self.config.target_config.get(&target).map(|t| t.no_std)
      }
  
@@ -98,5 +98,5 @@ index 5ed6b357e20a..c23b21d65713 100644
      /// and `remote-test-server` binaries.
      fn remote_tested(&self, target: TargetSelection) -> bool {
 -- 
-2.44.0
+2.46.0
 
diff --git a/0001-handle-no_std-targets-on-std-builds.patch b/0001-handle-no_std-targets-on-std-builds.patch
new file mode 100644
index 0000000..964b030
--- /dev/null
+++ b/0001-handle-no_std-targets-on-std-builds.patch
@@ -0,0 +1,103 @@
+From c41f254ad192a4ab402b40f8bdad169a8163140a Mon Sep 17 00:00:00 2001
+From: onur-ozkan <work@onurozkan.dev>
+Date: Thu, 25 Jul 2024 15:59:25 +0300
+Subject: [PATCH] handle no_std targets on std builds
+
+This change unifies the `Step::run_make` logic and improves it by skipping
+std specific crates for no_std targets.
+
+Signed-off-by: onur-ozkan <work@onurozkan.dev>
+(cherry picked from commit 6e247195c644aa924a10c98cc8eb3a28e1a87929)
+---
+ src/bootstrap/src/core/build_steps/check.rs   |  4 ++--
+ src/bootstrap/src/core/build_steps/clippy.rs  |  3 ++-
+ src/bootstrap/src/core/build_steps/compile.rs | 23 +++++++++++++++----
+ 3 files changed, 22 insertions(+), 8 deletions(-)
+
+diff --git a/src/bootstrap/src/core/build_steps/check.rs b/src/bootstrap/src/core/build_steps/check.rs
+index 8235d4634b75..bbad3f179ac7 100644
+--- a/src/bootstrap/src/core/build_steps/check.rs
++++ b/src/bootstrap/src/core/build_steps/check.rs
+@@ -1,7 +1,7 @@
+ //! Implementation of compiling the compiler and standard library, in "check"-based modes.
+ 
+ use crate::core::build_steps::compile::{
+-    add_to_sysroot, run_cargo, rustc_cargo, rustc_cargo_env, std_cargo,
++    add_to_sysroot, run_cargo, rustc_cargo, rustc_cargo_env, std_cargo, std_crates_for_run_make,
+ };
+ use crate::core::build_steps::tool::{prepare_tool_cargo, SourceType};
+ use crate::core::builder::{
+@@ -47,7 +47,7 @@ fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
+     }
+ 
+     fn make_run(run: RunConfig<'_>) {
+-        let crates = run.make_run_crates(Alias::Library);
++        let crates = std_crates_for_run_make(&run);
+         run.builder.ensure(Std { target: run.target, crates });
+     }
+ 
+diff --git a/src/bootstrap/src/core/build_steps/clippy.rs b/src/bootstrap/src/core/build_steps/clippy.rs
+index 40a2112b1925..a3ab094d799d 100644
+--- a/src/bootstrap/src/core/build_steps/clippy.rs
++++ b/src/bootstrap/src/core/build_steps/clippy.rs
+@@ -4,6 +4,7 @@
+ 
+ use crate::builder::Builder;
+ use crate::builder::ShouldRun;
++use crate::core::build_steps::compile::std_crates_for_run_make;
+ use crate::core::builder;
+ use crate::core::builder::crate_description;
+ use crate::core::builder::Alias;
+@@ -122,7 +123,7 @@ fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
+     }
+ 
+     fn make_run(run: RunConfig<'_>) {
+-        let crates = run.make_run_crates(Alias::Library);
++        let crates = std_crates_for_run_make(&run);
+         run.builder.ensure(Std { target: run.target, crates });
+     }
+ 
+diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
+index 525b6e956405..19c8cbc54080 100644
+--- a/src/bootstrap/src/core/build_steps/compile.rs
++++ b/src/bootstrap/src/core/build_steps/compile.rs
+@@ -127,11 +127,7 @@ fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
+     }
+ 
+     fn make_run(run: RunConfig<'_>) {
+-        // If the paths include "library", build the entire standard library.
+-        let has_alias =
+-            run.paths.iter().any(|set| set.assert_single_path().path.ends_with("library"));
+-        let crates = if has_alias { Default::default() } else { run.cargo_crates_in_set() };
+-
++        let crates = std_crates_for_run_make(&run);
+         run.builder.ensure(Std {
+             compiler: run.builder.compiler(run.builder.top_stage, run.build_triple()),
+             target: run.target,
+@@ -428,6 +424,23 @@ fn copy_self_contained_objects(
+     target_deps
+ }
+ 
++/// Resolves standard library crates for `Std::run_make` for any build kind (like check, build, clippy, etc.).
++pub fn std_crates_for_run_make(run: &RunConfig<'_>) -> Vec<String> {
++    let has_alias = run.paths.iter().any(|set| set.assert_single_path().path.ends_with("library"));
++    let target_is_no_std = run.builder.no_std(run.target).unwrap_or(false);
++
++    // For no_std targets, do not add any additional crates to the compilation other than what `compile::std_cargo` already adds for no_std targets.
++    if target_is_no_std {
++        vec![]
++    }
++    // If the paths include "library", build the entire standard library.
++    else if has_alias {
++        run.make_run_crates(builder::Alias::Library)
++    } else {
++        run.cargo_crates_in_set()
++    }
++}
++
+ /// Configure cargo to compile the standard library, adding appropriate env vars
+ /// and such.
+ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, cargo: &mut Cargo) {
+-- 
+2.46.0
+
diff --git a/0002-set-an-external-library-path-for-wasm32-wasi.patch b/0002-set-an-external-library-path-for-wasm32-wasi.patch
index 34ab22a..5d8c836 100644
--- a/0002-set-an-external-library-path-for-wasm32-wasi.patch
+++ b/0002-set-an-external-library-path-for-wasm32-wasi.patch
@@ -1,4 +1,4 @@
-From e3b7d2e3d3b4fcbc6591de606957c0fd59b5e547 Mon Sep 17 00:00:00 2001
+From 348b03695d916ab23a9d66c4ceed2ecbecfc68e7 Mon Sep 17 00:00:00 2001
 From: Josh Stone <jistone@redhat.com>
 Date: Thu, 28 Sep 2023 18:18:16 -0700
 Subject: [PATCH 2/2] set an external library path for wasm32-wasi
@@ -10,10 +10,10 @@ Subject: [PATCH 2/2] set an external library path for wasm32-wasi
  3 files changed, 17 insertions(+), 3 deletions(-)
 
 diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
-index f5e8d5fc92a9..f4ad3f725427 100644
+index 8c582fac0d82..169d86cd6224 100644
 --- a/compiler/rustc_codegen_ssa/src/back/link.rs
 +++ b/compiler/rustc_codegen_ssa/src/back/link.rs
-@@ -1563,6 +1563,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat
+@@ -1586,6 +1586,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat
              return file_path;
          }
      }
@@ -26,7 +26,7 @@ index f5e8d5fc92a9..f4ad3f725427 100644
      for search_path in fs.search_paths() {
          let file_path = search_path.dir.join(name);
          if file_path.exists() {
-@@ -2049,6 +2055,9 @@ fn add_library_search_dirs(cmd: &mut dyn Linker, sess: &Session, self_contained:
+@@ -2076,6 +2082,9 @@ fn add_library_search_dirs(cmd: &mut dyn Linker, sess: &Session, self_contained:
          let lib_path = sess.target_filesearch(PathKind::All).get_self_contained_lib_path();
          cmd.include_path(&fix_windows_verbatim_for_gcc(&lib_path));
      }
@@ -37,10 +37,10 @@ index f5e8d5fc92a9..f4ad3f725427 100644
  
  /// Add options making relocation sections in the produced ELF files read-only
 diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
-index 941d767b850d..cd0a2ce51989 100644
+index 607eeac7ccdc..63070622502e 100644
 --- a/compiler/rustc_target/src/spec/mod.rs
 +++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -1881,6 +1881,7 @@ pub struct TargetOptions {
+@@ -2033,6 +2033,7 @@ pub struct TargetOptions {
      /// Objects to link before and after all other object code.
      pub pre_link_objects: CrtObjects,
      pub post_link_objects: CrtObjects,
@@ -48,7 +48,7 @@ index 941d767b850d..cd0a2ce51989 100644
      /// Same as `(pre|post)_link_objects`, but when self-contained linking mode is enabled.
      pub pre_link_objects_self_contained: CrtObjects,
      pub post_link_objects_self_contained: CrtObjects,
-@@ -2368,6 +2369,7 @@ fn default() -> TargetOptions {
+@@ -2520,6 +2521,7 @@ fn default() -> TargetOptions {
              relro_level: RelroLevel::None,
              pre_link_objects: Default::default(),
              post_link_objects: Default::default(),
@@ -56,7 +56,7 @@ index 941d767b850d..cd0a2ce51989 100644
              pre_link_objects_self_contained: Default::default(),
              post_link_objects_self_contained: Default::default(),
              link_self_contained: LinkSelfContainedDefault::False,
-@@ -3064,6 +3066,7 @@ macro_rules! key {
+@@ -3202,6 +3204,7 @@ macro_rules! key {
          key!(linker_is_gnu_json = "linker-is-gnu", bool);
          key!(pre_link_objects = "pre-link-objects", link_objects);
          key!(post_link_objects = "post-link-objects", link_objects);
@@ -64,7 +64,7 @@ index 941d767b850d..cd0a2ce51989 100644
          key!(pre_link_objects_self_contained = "pre-link-objects-fallback", link_objects);
          key!(post_link_objects_self_contained = "post-link-objects-fallback", link_objects);
          // Deserializes the backwards-compatible variants of `-Clink-self-contained`
-@@ -3327,6 +3330,7 @@ macro_rules! target_option_val {
+@@ -3464,6 +3467,7 @@ macro_rules! target_option_val {
          target_option_val!(linker_is_gnu_json, "linker-is-gnu");
          target_option_val!(pre_link_objects);
          target_option_val!(post_link_objects);
@@ -73,11 +73,11 @@ index 941d767b850d..cd0a2ce51989 100644
          target_option_val!(post_link_objects_self_contained, "post-link-objects-fallback");
          target_option_val!(link_args - pre_link_args_json, "pre-link-args");
 diff --git a/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs
-index 7cbe9f09e6ca..b524890c2ec5 100644
+index a8e7f22c0689..55949557d6bb 100644
 --- a/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs
 +++ b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs
-@@ -20,11 +20,12 @@ pub fn target() -> Target {
-     options.os = "wasi".into();
+@@ -21,11 +21,12 @@ pub fn target() -> Target {
+     options.env = "p1".into();
      options.add_pre_link_args(LinkerFlavor::WasmLld(Cc::Yes), &["--target=wasm32-wasi"]);
  
 -    options.pre_link_objects_self_contained = crt_objects::pre_wasi_self_contained();
@@ -93,5 +93,5 @@ index 7cbe9f09e6ca..b524890c2ec5 100644
      // Right now this is a bit of a workaround but we're currently saying that
      // the target by default has a static crt which we're taking as a signal
 -- 
-2.44.0
+2.46.0
 
diff --git a/rust.spec b/rust.spec
index 29002ed..529af98 100644
--- a/rust.spec
+++ b/rust.spec
@@ -1,5 +1,5 @@
 Name:           rust
-Version:        1.80.1
+Version:        1.81.0
 Release:        1%{?dist}
 Summary:        The Rust Programming Language
 License:        (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-DFS-2016)
@@ -14,9 +14,9 @@ ExclusiveArch:  %{rust_arches}
 # To bootstrap from scratch, set the channel and date from src/stage0.json
 # e.g. 1.59.0 wants rustc: 1.58.0-2022-01-13
 # or nightly wants some beta-YYYY-MM-DD
-%global bootstrap_version 1.79.0
-%global bootstrap_channel 1.79.0
-%global bootstrap_date 2024-06-13
+%global bootstrap_version 1.80.1
+%global bootstrap_channel 1.80.1
+%global bootstrap_date 2024-08-08
 
 # Only the specified arches will use bootstrap binaries.
 # NOTE: Those binaries used to be uploaded with every new release, but that was
@@ -58,7 +58,8 @@ ExclusiveArch:  %{rust_arches}
 # We need CRT files for *-wasi targets, at least as new as the commit in
 # src/ci/docker/host-x86_64/dist-various-2/build-wasi-toolchain.sh
 %global wasi_libc_url https://github.com/WebAssembly/wasi-libc
-%global wasi_libc_ref wasi-sdk-22
+#global wasi_libc_ref wasi-sdk-24
+%global wasi_libc_ref b9ef79d7dbd47c6c5bafdae760823467c2f60b70
 %global wasi_libc_name wasi-libc-%{wasi_libc_ref}
 %global wasi_libc_source %{wasi_libc_url}/archive/%{wasi_libc_ref}/%{wasi_libc_name}.tar.gz
 %global wasi_libc_dir %{_builddir}/%{wasi_libc_name}
@@ -81,10 +82,10 @@ ExclusiveArch:  %{rust_arches}
 
 # Requires stable libgit2 1.7, and not the next minor soname change.
 # This needs to be consistent with the bindings in vendor/libgit2-sys.
-%global min_libgit2_version 1.7.2
-%global next_libgit2_version 1.8.0~
-%global bundled_libgit2_version 1.7.2
-%if 0%{?fedora} >= 39
+%global min_libgit2_version 1.8.1
+%global next_libgit2_version 1.9.0~
+%global bundled_libgit2_version 1.8.1
+%if 0%{?fedora} >= 42
 %bcond_with bundled_libgit2
 %else
 %bcond_without bundled_libgit2
@@ -158,10 +159,17 @@ Patch4:         0001-bootstrap-allow-disabling-target-self-contained.patch
 Patch5:         0002-set-an-external-library-path-for-wasm32-wasi.patch
 
 # We don't want to use the bundled library in libsqlite3-sys
-Patch6:         rustc-1.80.0-unbundle-sqlite.patch
+Patch6:         rustc-1.81.0-unbundle-sqlite.patch
 
-# Fix codegen test failure on big endian: https://github.com/rust-lang/rust/pull/126263
-Patch7:         0001-Make-issue-122805.rs-big-endian-compatible.patch
+# handle no_std targets on std builds
+# https://github.com/rust-lang/rust/pull/128182
+Patch7:         0001-handle-no_std-targets-on-std-builds.patch
+
+# https://github.com/rust-lang/rust/pull/130960
+Patch8:         0001-Only-add-an-automatic-SONAME-for-Rust-dylibs.patch
+
+# https://github.com/rust-lang/rust/pull/127513
+Patch9:         rustc-1.81.0-Update-to-LLVM-19.patch
 
 ### RHEL-specific patches below ###
 
@@ -171,7 +179,7 @@ Source101:      cargo_vendor.attr
 Source102:      cargo_vendor.prov
 
 # Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949)
-Patch100:       rustc-1.80.0-disable-libssh2.patch
+Patch100:       rustc-1.81.0-disable-libssh2.patch
 
 # Get the Rust triple for any arch.
 %{lua: function rust_triple(arch)
@@ -566,6 +574,9 @@ A tool for formatting Rust code according to style guidelines.
 %package analyzer
 Summary:        Rust implementation of the Language Server Protocol
 
+# /usr/bin/rust-analyzer is dynamically linked against internal rustc libs
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
 # The standard library sources are needed for most functionality.
 Recommends:     %{name}-src
 
@@ -652,6 +663,8 @@ rm -rf %{wasi_libc_dir}/dlmalloc/
 %patch -P6 -p1
 %endif
 %patch -P7 -p1
+%patch -P8 -p1
+%patch -P9 -p1
 
 %if %with disabled_libssh2
 %patch -P100 -p1
@@ -821,6 +834,8 @@ test -r "%{profiler}"
     %{!?llvm_has_filecheck: --disable-codegen-tests} \
     %{!?with_llvm_static: --enable-llvm-link-shared } } \
   --disable-llvm-static-stdcpp \
+  --disable-llvm-bitcode-linker \
+  --disable-lld \
   --disable-rpath \
   %{enable_debuginfo} \
   %{enable_rust_opts} \
@@ -981,9 +996,12 @@ rm -rf "$TMP_HELLO"
 # The results are not stable on koji, so mask errors and just log it.
 # Some of the larger test artifacts are manually cleaned to save space.
 
-# Bootstrap is excluded because it's not something we ship, and a lot of its
-# tests are geared toward the upstream CI environment.
-%{__x} test --no-fail-fast --skip src/bootstrap || :
+# - Bootstrap is excluded because it's not something we ship, and a lot of its
+#   tests are geared toward the upstream CI environment.
+# - Crashes are excluded because they are less reliable, especially stuff like
+#   SIGSEGV across different arches -- UB can do all kinds of weird things.
+#   They're only meant to notice "accidental" fixes anyway, not *should* crash.
+%{__x} test --no-fail-fast --skip={src/bootstrap,tests/crashes} || :
 rm -rf "./build/%{rust_triple}/test/"
 
 %ifarch aarch64
@@ -1157,6 +1175,9 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 
 
 %changelog
+* Fri Oct 25 2024 Josh Stone <jistone@redhat.com> - 1.81.0-1
+- Update to 1.81.0
+
 * Tue Oct 22 2024 Josh Stone <jistone@redhat.com> - 1.80.1-1
 - Update to 1.80.1
 
diff --git a/rustc-1.81.0-Update-to-LLVM-19.patch b/rustc-1.81.0-Update-to-LLVM-19.patch
new file mode 100644
index 0000000..cd8145a
--- /dev/null
+++ b/rustc-1.81.0-Update-to-LLVM-19.patch
@@ -0,0 +1,560 @@
+From 83f32e189ad59109a162a61d7844545c4eda48e7 Mon Sep 17 00:00:00 2001
+From: Nikita Popov <npopov@redhat.com>
+Date: Tue, 9 Jul 2024 09:34:59 +0200
+Subject: [PATCH 1/4] Update to LLVM 19
+
+(cherry picked from commit 579ab05e76f1434f3074195c7291895f1257bc97)
+---
+ .gitmodules      | 2 +-
+ src/llvm-project | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/.gitmodules b/.gitmodules
+index 9ad207a0d522..b5250d493864 100644
+--- a/.gitmodules
++++ b/.gitmodules
+@@ -33,7 +33,7 @@
+ [submodule "src/llvm-project"]
+ 	path = src/llvm-project
+ 	url = https://github.com/rust-lang/llvm-project.git
+-	branch = rustc/18.1-2024-05-19
++	branch = rustc/19.1-2024-07-30
+ 	shallow = true
+ [submodule "src/doc/embedded-book"]
+ 	path = src/doc/embedded-book
+-- 
+2.46.1
+
+
+From 3bdb9f55ed61e1984e9b2ac23c328a4792e41b6e Mon Sep 17 00:00:00 2001
+From: Krasimir Georgiev <krasimir@google.com>
+Date: Mon, 17 Jun 2024 09:35:38 +0000
+Subject: [PATCH 2/4] Disable MC/DC tests on LLVM 19
+
+Disable the tests and generate an error if MC/DC is used on LLVM 19.
+The support will be ported separately, as it is substantially
+different on LLVM 19, and there are no plans to support both
+versions.
+
+(cherry picked from commit 00bfd702dc8c3b760b4f965fd059a5f1db8bb2b1)
+---
+ compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | 2 +-
+ tests/coverage/mcdc/condition-limit.rs           | 1 +
+ tests/coverage/mcdc/if.rs                        | 1 +
+ tests/coverage/mcdc/inlined_expressions.rs       | 1 +
+ tests/coverage/mcdc/nested_if.rs                 | 1 +
+ tests/coverage/mcdc/non_control_flow.rs          | 1 +
+ 6 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
+index 14757b27a375..493cfbcec2cf 100644
+--- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
++++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
+@@ -1557,7 +1557,7 @@ LLVMRustGetInstrProfMCDCTVBitmapUpdateIntrinsic(LLVMModuleRef M) {
+ 
+ extern "C" LLVMValueRef
+ LLVMRustGetInstrProfMCDCCondBitmapIntrinsic(LLVMModuleRef M) {
+-#if LLVM_VERSION_GE(18, 0)
++#if LLVM_VERSION_GE(18, 0) && LLVM_VERSION_LT(19, 0)
+   return wrap(llvm::Intrinsic::getDeclaration(
+       unwrap(M), llvm::Intrinsic::instrprof_mcdc_condbitmap_update));
+ #else
+diff --git a/tests/coverage/mcdc/condition-limit.rs b/tests/coverage/mcdc/condition-limit.rs
+index 571c600ebd09..2ff46b11a168 100644
+--- a/tests/coverage/mcdc/condition-limit.rs
++++ b/tests/coverage/mcdc/condition-limit.rs
+@@ -1,6 +1,7 @@
+ #![feature(coverage_attribute)]
+ //@ edition: 2021
+ //@ min-llvm-version: 18
++//@ ignore-llvm-version: 19 - 99
+ //@ compile-flags: -Zcoverage-options=mcdc
+ //@ llvm-cov-flags: --show-branches=count --show-mcdc
+ 
+diff --git a/tests/coverage/mcdc/if.rs b/tests/coverage/mcdc/if.rs
+index d8e6b61a9d59..6f589659a3d7 100644
+--- a/tests/coverage/mcdc/if.rs
++++ b/tests/coverage/mcdc/if.rs
+@@ -1,6 +1,7 @@
+ #![feature(coverage_attribute)]
+ //@ edition: 2021
+ //@ min-llvm-version: 18
++//@ ignore-llvm-version: 19 - 99
+ //@ compile-flags: -Zcoverage-options=mcdc
+ //@ llvm-cov-flags: --show-branches=count --show-mcdc
+ 
+diff --git a/tests/coverage/mcdc/inlined_expressions.rs b/tests/coverage/mcdc/inlined_expressions.rs
+index 65f7ee66f399..fc1e4dae37c7 100644
+--- a/tests/coverage/mcdc/inlined_expressions.rs
++++ b/tests/coverage/mcdc/inlined_expressions.rs
+@@ -1,6 +1,7 @@
+ #![feature(coverage_attribute)]
+ //@ edition: 2021
+ //@ min-llvm-version: 18
++//@ ignore-llvm-version: 19 - 99
+ //@ compile-flags: -Zcoverage-options=mcdc -Copt-level=z -Cllvm-args=--inline-threshold=0
+ //@ llvm-cov-flags: --show-branches=count --show-mcdc
+ 
+diff --git a/tests/coverage/mcdc/nested_if.rs b/tests/coverage/mcdc/nested_if.rs
+index f5068b5dcc23..f9ce7a0bc254 100644
+--- a/tests/coverage/mcdc/nested_if.rs
++++ b/tests/coverage/mcdc/nested_if.rs
+@@ -1,6 +1,7 @@
+ #![feature(coverage_attribute)]
+ //@ edition: 2021
+ //@ min-llvm-version: 18
++//@ ignore-llvm-version: 19 - 99
+ //@ compile-flags: -Zcoverage-options=mcdc
+ //@ llvm-cov-flags: --show-branches=count --show-mcdc
+ 
+diff --git a/tests/coverage/mcdc/non_control_flow.rs b/tests/coverage/mcdc/non_control_flow.rs
+index 77e64e6625b2..633d381a1aaf 100644
+--- a/tests/coverage/mcdc/non_control_flow.rs
++++ b/tests/coverage/mcdc/non_control_flow.rs
+@@ -1,6 +1,7 @@
+ #![feature(coverage_attribute)]
+ //@ edition: 2021
+ //@ min-llvm-version: 18
++//@ ignore-llvm-version: 19 - 99
+ //@ compile-flags: -Zcoverage-options=mcdc
+ //@ llvm-cov-flags: --show-branches=count --show-mcdc
+ 
+-- 
+2.46.1
+
+
+From d9476247415418ec6cc3478636ada38cf28feb69 Mon Sep 17 00:00:00 2001
+From: Nikita Popov <npopov@redhat.com>
+Date: Wed, 24 Jul 2024 16:03:36 +0200
+Subject: [PATCH 3/4] Crash test for issue 121444 has been fixed
+
+(cherry picked from commit b960390548b373bd80b5d9fe590ae3b577e8e8f2)
+---
+ tests/{crashes/121444.rs => ui/abi/large-byval-align.rs} | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+ rename tests/{crashes/121444.rs => ui/abi/large-byval-align.rs} (68%)
+
+diff --git a/tests/crashes/121444.rs b/tests/ui/abi/large-byval-align.rs
+similarity index 68%
+rename from tests/crashes/121444.rs
+rename to tests/ui/abi/large-byval-align.rs
+index a6373a58c426..e39170df72b4 100644
+--- a/tests/crashes/121444.rs
++++ b/tests/ui/abi/large-byval-align.rs
+@@ -1,11 +1,13 @@
+-//@ known-bug: #121444
+ //@ compile-flags: -Copt-level=0
+-//@ edition:2021
+ //@ only-x86_64
+ //@ ignore-windows
++//@ min-llvm-version: 19
++//@ build-pass
++
+ #[repr(align(536870912))]
+ pub struct A(i64);
+ 
++#[allow(improper_ctypes_definitions)]
+ pub extern "C" fn foo(x: A) {}
+ 
+ fn main() {
+-- 
+2.46.1
+
+
+From 05f84c2aa8853263b650b21637f689255413b923 Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Tue, 30 Jul 2024 18:25:05 -0700
+Subject: [PATCH 4/4] Bless coverage/mcdc for line number changes
+
+(cherry picked from commit 33a36ea43851a767d8182938161b0dad4f9ae68c)
+---
+ tests/coverage/mcdc/condition-limit.cov-map   |  8 +++---
+ tests/coverage/mcdc/if.cov-map                | 28 +++++++++----------
+ .../coverage/mcdc/inlined_expressions.cov-map |  4 +--
+ tests/coverage/mcdc/nested_if.cov-map         | 16 +++++------
+ tests/coverage/mcdc/non_control_flow.cov-map  | 28 +++++++++----------
+ 5 files changed, 42 insertions(+), 42 deletions(-)
+
+diff --git a/tests/coverage/mcdc/condition-limit.cov-map b/tests/coverage/mcdc/condition-limit.cov-map
+index b4447a33691a..b565353572a7 100644
+--- a/tests/coverage/mcdc/condition-limit.cov-map
++++ b/tests/coverage/mcdc/condition-limit.cov-map
+@@ -1,5 +1,5 @@
+ Function name: condition_limit::bad
+-Raw bytes (204): 0x[01, 01, 2c, 01, 05, 05, 1d, 05, 1d, 7a, 19, 05, 1d, 7a, 19, 05, 1d, 76, 15, 7a, 19, 05, 1d, 76, 15, 7a, 19, 05, 1d, 72, 11, 76, 15, 7a, 19, 05, 1d, 72, 11, 76, 15, 7a, 19, 05, 1d, 6e, 0d, 72, 11, 76, 15, 7a, 19, 05, 1d, 6e, 0d, 72, 11, 76, 15, 7a, 19, 05, 1d, 9f, 01, 02, a3, 01, 1d, a7, 01, 19, ab, 01, 15, af, 01, 11, 09, 0d, 21, 9b, 01, 9f, 01, 02, a3, 01, 1d, a7, 01, 19, ab, 01, 15, af, 01, 11, 09, 0d, 11, 01, 14, 01, 03, 09, 20, 05, 02, 03, 08, 00, 09, 05, 00, 0d, 00, 0e, 20, 7a, 1d, 00, 0d, 00, 0e, 7a, 00, 12, 00, 13, 20, 76, 19, 00, 12, 00, 13, 76, 00, 17, 00, 18, 20, 72, 15, 00, 17, 00, 18, 72, 00, 1c, 00, 1d, 20, 6e, 11, 00, 1c, 00, 1d, 6e, 00, 21, 00, 22, 20, 6a, 0d, 00, 21, 00, 22, 6a, 00, 26, 00, 27, 20, 21, 09, 00, 26, 00, 27, 21, 00, 28, 02, 06, 9b, 01, 02, 06, 00, 07, 97, 01, 01, 01, 00, 02]
++Raw bytes (204): 0x[01, 01, 2c, 01, 05, 05, 1d, 05, 1d, 7a, 19, 05, 1d, 7a, 19, 05, 1d, 76, 15, 7a, 19, 05, 1d, 76, 15, 7a, 19, 05, 1d, 72, 11, 76, 15, 7a, 19, 05, 1d, 72, 11, 76, 15, 7a, 19, 05, 1d, 6e, 0d, 72, 11, 76, 15, 7a, 19, 05, 1d, 6e, 0d, 72, 11, 76, 15, 7a, 19, 05, 1d, 9f, 01, 02, a3, 01, 1d, a7, 01, 19, ab, 01, 15, af, 01, 11, 09, 0d, 21, 9b, 01, 9f, 01, 02, a3, 01, 1d, a7, 01, 19, ab, 01, 15, af, 01, 11, 09, 0d, 11, 01, 15, 01, 03, 09, 20, 05, 02, 03, 08, 00, 09, 05, 00, 0d, 00, 0e, 20, 7a, 1d, 00, 0d, 00, 0e, 7a, 00, 12, 00, 13, 20, 76, 19, 00, 12, 00, 13, 76, 00, 17, 00, 18, 20, 72, 15, 00, 17, 00, 18, 72, 00, 1c, 00, 1d, 20, 6e, 11, 00, 1c, 00, 1d, 6e, 00, 21, 00, 22, 20, 6a, 0d, 00, 21, 00, 22, 6a, 00, 26, 00, 27, 20, 21, 09, 00, 26, 00, 27, 21, 00, 28, 02, 06, 9b, 01, 02, 06, 00, 07, 97, 01, 01, 01, 00, 02]
+ Number of files: 1
+ - file 0 => global file 1
+ Number of expressions: 44
+@@ -48,7 +48,7 @@ Number of expressions: 44
+ - expression 42 operands: lhs = Expression(43, Add), rhs = Counter(4)
+ - expression 43 operands: lhs = Counter(2), rhs = Counter(3)
+ Number of file 0 mappings: 17
+-- Code(Counter(0)) at (prev + 20, 1) to (start + 3, 9)
++- Code(Counter(0)) at (prev + 21, 1) to (start + 3, 9)
+ - Branch { true: Counter(1), false: Expression(0, Sub) } at (prev + 3, 8) to (start + 0, 9)
+     true  = c1
+     false = (c0 - c1)
+@@ -88,7 +88,7 @@ Number of file 0 mappings: 17
+     = (c8 + ((((((c2 + c3) + c4) + c5) + c6) + c7) + (c0 - c1)))
+ 
+ Function name: condition_limit::good
+-Raw bytes (180): 0x[01, 01, 20, 01, 05, 05, 19, 05, 19, 52, 15, 05, 19, 52, 15, 05, 19, 4e, 11, 52, 15, 05, 19, 4e, 11, 52, 15, 05, 19, 4a, 0d, 4e, 11, 52, 15, 05, 19, 4a, 0d, 4e, 11, 52, 15, 05, 19, 73, 02, 77, 19, 7b, 15, 7f, 11, 09, 0d, 1d, 6f, 73, 02, 77, 19, 7b, 15, 7f, 11, 09, 0d, 10, 01, 0c, 01, 03, 09, 28, 00, 06, 03, 08, 00, 22, 30, 05, 02, 01, 06, 00, 00, 08, 00, 09, 05, 00, 0d, 00, 0e, 30, 52, 19, 06, 05, 00, 00, 0d, 00, 0e, 52, 00, 12, 00, 13, 30, 4e, 15, 05, 04, 00, 00, 12, 00, 13, 4e, 00, 17, 00, 18, 30, 4a, 11, 04, 03, 00, 00, 17, 00, 18, 4a, 00, 1c, 00, 1d, 30, 46, 0d, 03, 02, 00, 00, 1c, 00, 1d, 46, 00, 21, 00, 22, 30, 1d, 09, 02, 00, 00, 00, 21, 00, 22, 1d, 00, 23, 02, 06, 6f, 02, 06, 00, 07, 6b, 01, 01, 00, 02]
++Raw bytes (180): 0x[01, 01, 20, 01, 05, 05, 19, 05, 19, 52, 15, 05, 19, 52, 15, 05, 19, 4e, 11, 52, 15, 05, 19, 4e, 11, 52, 15, 05, 19, 4a, 0d, 4e, 11, 52, 15, 05, 19, 4a, 0d, 4e, 11, 52, 15, 05, 19, 73, 02, 77, 19, 7b, 15, 7f, 11, 09, 0d, 1d, 6f, 73, 02, 77, 19, 7b, 15, 7f, 11, 09, 0d, 10, 01, 0d, 01, 03, 09, 28, 00, 06, 03, 08, 00, 22, 30, 05, 02, 01, 06, 00, 00, 08, 00, 09, 05, 00, 0d, 00, 0e, 30, 52, 19, 06, 05, 00, 00, 0d, 00, 0e, 52, 00, 12, 00, 13, 30, 4e, 15, 05, 04, 00, 00, 12, 00, 13, 4e, 00, 17, 00, 18, 30, 4a, 11, 04, 03, 00, 00, 17, 00, 18, 4a, 00, 1c, 00, 1d, 30, 46, 0d, 03, 02, 00, 00, 1c, 00, 1d, 46, 00, 21, 00, 22, 30, 1d, 09, 02, 00, 00, 00, 21, 00, 22, 1d, 00, 23, 02, 06, 6f, 02, 06, 00, 07, 6b, 01, 01, 00, 02]
+ Number of files: 1
+ - file 0 => global file 1
+ Number of expressions: 32
+@@ -125,7 +125,7 @@ Number of expressions: 32
+ - expression 30 operands: lhs = Expression(31, Add), rhs = Counter(4)
+ - expression 31 operands: lhs = Counter(2), rhs = Counter(3)
+ Number of file 0 mappings: 16
+-- Code(Counter(0)) at (prev + 12, 1) to (start + 3, 9)
++- Code(Counter(0)) at (prev + 13, 1) to (start + 3, 9)
+ - MCDCDecision { bitmap_idx: 0, conditions_num: 6 } at (prev + 3, 8) to (start + 0, 34)
+ - MCDCBranch { true: Counter(1), false: Expression(0, Sub), condition_id: 1, true_next_id: 6, false_next_id: 0 } at (prev + 0, 8) to (start + 0, 9)
+     true  = c1
+diff --git a/tests/coverage/mcdc/if.cov-map b/tests/coverage/mcdc/if.cov-map
+index 9a7d15f700df..ea8dedb0ac36 100644
+--- a/tests/coverage/mcdc/if.cov-map
++++ b/tests/coverage/mcdc/if.cov-map
+@@ -1,5 +1,5 @@
+ Function name: if::mcdc_check_a
+-Raw bytes (64): 0x[01, 01, 04, 01, 05, 09, 02, 0d, 0f, 09, 02, 08, 01, 0f, 01, 01, 09, 28, 00, 02, 01, 08, 00, 0e, 30, 05, 02, 01, 02, 00, 00, 08, 00, 09, 05, 00, 0d, 00, 0e, 30, 0d, 09, 02, 00, 00, 00, 0d, 00, 0e, 0d, 00, 0f, 02, 06, 0f, 02, 0c, 02, 06, 0b, 03, 01, 00, 02]
++Raw bytes (64): 0x[01, 01, 04, 01, 05, 09, 02, 0d, 0f, 09, 02, 08, 01, 10, 01, 01, 09, 28, 00, 02, 01, 08, 00, 0e, 30, 05, 02, 01, 02, 00, 00, 08, 00, 09, 05, 00, 0d, 00, 0e, 30, 0d, 09, 02, 00, 00, 00, 0d, 00, 0e, 0d, 00, 0f, 02, 06, 0f, 02, 0c, 02, 06, 0b, 03, 01, 00, 02]
+ Number of files: 1
+ - file 0 => global file 1
+ Number of expressions: 4
+@@ -8,7 +8,7 @@ Number of expressions: 4
+ - expression 2 operands: lhs = Counter(3), rhs = Expression(3, Add)
+ - expression 3 operands: lhs = Counter(2), rhs = Expression(0, Sub)
+ Number of file 0 mappings: 8
+-- Code(Counter(0)) at (prev + 15, 1) to (start + 1, 9)
++- Code(Counter(0)) at (prev + 16, 1) to (start + 1, 9)
+ - MCDCDecision { bitmap_idx: 0, conditions_num: 2 } at (prev + 1, 8) to (start + 0, 14)
+ - MCDCBranch { true: Counter(1), false: Expression(0, Sub), condition_id: 1, true_next_id: 2, false_next_id: 0 } at (prev + 0, 8) to (start + 0, 9)
+     true  = c1
+@@ -24,7 +24,7 @@ Number of file 0 mappings: 8
+     = (c3 + (c2 + (c0 - c1)))
+ 
+ Function name: if::mcdc_check_b
+-Raw bytes (64): 0x[01, 01, 04, 01, 05, 09, 02, 0d, 0f, 09, 02, 08, 01, 17, 01, 01, 09, 28, 00, 02, 01, 08, 00, 0e, 30, 05, 02, 01, 02, 00, 00, 08, 00, 09, 05, 00, 0d, 00, 0e, 30, 0d, 09, 02, 00, 00, 00, 0d, 00, 0e, 0d, 00, 0f, 02, 06, 0f, 02, 0c, 02, 06, 0b, 03, 01, 00, 02]
++Raw bytes (64): 0x[01, 01, 04, 01, 05, 09, 02, 0d, 0f, 09, 02, 08, 01, 18, 01, 01, 09, 28, 00, 02, 01, 08, 00, 0e, 30, 05, 02, 01, 02, 00, 00, 08, 00, 09, 05, 00, 0d, 00, 0e, 30, 0d, 09, 02, 00, 00, 00, 0d, 00, 0e, 0d, 00, 0f, 02, 06, 0f, 02, 0c, 02, 06, 0b, 03, 01, 00, 02]
+ Number of files: 1
+ - file 0 => global file 1
+ Number of expressions: 4
+@@ -33,7 +33,7 @@ Number of expressions: 4
+ - expression 2 operands: lhs = Counter(3), rhs = Expression(3, Add)
+ - expression 3 operands: lhs = Counter(2), rhs = Expression(0, Sub)
+ Number of file 0 mappings: 8
+-- Code(Counter(0)) at (prev + 23, 1) to (start + 1, 9)
++- Code(Counter(0)) at (prev + 24, 1) to (start + 1, 9)
+ - MCDCDecision { bitmap_idx: 0, conditions_num: 2 } at (prev + 1, 8) to (start + 0, 14)
+ - MCDCBranch { true: Counter(1), false: Expression(0, Sub), condition_id: 1, true_next_id: 2, false_next_id: 0 } at (prev + 0, 8) to (start + 0, 9)
+     true  = c1
+@@ -49,7 +49,7 @@ Number of file 0 mappings: 8
+     = (c3 + (c2 + (c0 - c1)))
+ 
+ Function name: if::mcdc_check_both
+-Raw bytes (64): 0x[01, 01, 04, 01, 05, 09, 02, 0d, 0f, 09, 02, 08, 01, 1f, 01, 01, 09, 28, 00, 02, 01, 08, 00, 0e, 30, 05, 02, 01, 02, 00, 00, 08, 00, 09, 05, 00, 0d, 00, 0e, 30, 0d, 09, 02, 00, 00, 00, 0d, 00, 0e, 0d, 00, 0f, 02, 06, 0f, 02, 0c, 02, 06, 0b, 03, 01, 00, 02]
++Raw bytes (64): 0x[01, 01, 04, 01, 05, 09, 02, 0d, 0f, 09, 02, 08, 01, 20, 01, 01, 09, 28, 00, 02, 01, 08, 00, 0e, 30, 05, 02, 01, 02, 00, 00, 08, 00, 09, 05, 00, 0d, 00, 0e, 30, 0d, 09, 02, 00, 00, 00, 0d, 00, 0e, 0d, 00, 0f, 02, 06, 0f, 02, 0c, 02, 06, 0b, 03, 01, 00, 02]
+ Number of files: 1
+ - file 0 => global file 1
+ Number of expressions: 4
+@@ -58,7 +58,7 @@ Number of expressions: 4
+ - expression 2 operands: lhs = Counter(3), rhs = Expression(3, Add)
+ - expression 3 operands: lhs = Counter(2), rhs = Expression(0, Sub)
+ Number of file 0 mappings: 8
+-- Code(Counter(0)) at (prev + 31, 1) to (start + 1, 9)
++- Code(Counter(0)) at (prev + 32, 1) to (start + 1, 9)
+ - MCDCDecision { bitmap_idx: 0, conditions_num: 2 } at (prev + 1, 8) to (start + 0, 14)
+ - MCDCBranch { true: Counter(1), false: Expression(0, Sub), condition_id: 1, true_next_id: 2, false_next_id: 0 } at (prev + 0, 8) to (start + 0, 9)
+     true  = c1
+@@ -74,7 +74,7 @@ Number of file 0 mappings: 8
+     = (c3 + (c2 + (c0 - c1)))
+ 
+ Function name: if::mcdc_check_neither
+-Raw bytes (64): 0x[01, 01, 04, 01, 05, 09, 02, 0d, 0f, 09, 02, 08, 01, 07, 01, 01, 09, 28, 00, 02, 01, 08, 00, 0e, 30, 05, 02, 01, 02, 00, 00, 08, 00, 09, 05, 00, 0d, 00, 0e, 30, 0d, 09, 02, 00, 00, 00, 0d, 00, 0e, 0d, 00, 0f, 02, 06, 0f, 02, 0c, 02, 06, 0b, 03, 01, 00, 02]
++Raw bytes (64): 0x[01, 01, 04, 01, 05, 09, 02, 0d, 0f, 09, 02, 08, 01, 08, 01, 01, 09, 28, 00, 02, 01, 08, 00, 0e, 30, 05, 02, 01, 02, 00, 00, 08, 00, 09, 05, 00, 0d, 00, 0e, 30, 0d, 09, 02, 00, 00, 00, 0d, 00, 0e, 0d, 00, 0f, 02, 06, 0f, 02, 0c, 02, 06, 0b, 03, 01, 00, 02]
+ Number of files: 1
+ - file 0 => global file 1
+ Number of expressions: 4
+@@ -83,7 +83,7 @@ Number of expressions: 4
+ - expression 2 operands: lhs = Counter(3), rhs = Expression(3, Add)
+ - expression 3 operands: lhs = Counter(2), rhs = Expression(0, Sub)
+ Number of file 0 mappings: 8
+-- Code(Counter(0)) at (prev + 7, 1) to (start + 1, 9)
++- Code(Counter(0)) at (prev + 8, 1) to (start + 1, 9)
+ - MCDCDecision { bitmap_idx: 0, conditions_num: 2 } at (prev + 1, 8) to (start + 0, 14)
+ - MCDCBranch { true: Counter(1), false: Expression(0, Sub), condition_id: 1, true_next_id: 2, false_next_id: 0 } at (prev + 0, 8) to (start + 0, 9)
+     true  = c1
+@@ -99,7 +99,7 @@ Number of file 0 mappings: 8
+     = (c3 + (c2 + (c0 - c1)))
+ 
+ Function name: if::mcdc_check_not_tree_decision
+-Raw bytes (87): 0x[01, 01, 08, 01, 05, 02, 09, 05, 09, 0d, 1e, 02, 09, 11, 1b, 0d, 1e, 02, 09, 0a, 01, 31, 01, 03, 0a, 28, 00, 03, 03, 08, 00, 15, 30, 05, 02, 01, 02, 03, 00, 09, 00, 0a, 02, 00, 0e, 00, 0f, 30, 09, 1e, 03, 02, 00, 00, 0e, 00, 0f, 0b, 00, 14, 00, 15, 30, 11, 0d, 02, 00, 00, 00, 14, 00, 15, 11, 00, 16, 02, 06, 1b, 02, 0c, 02, 06, 17, 03, 01, 00, 02]
++Raw bytes (87): 0x[01, 01, 08, 01, 05, 02, 09, 05, 09, 0d, 1e, 02, 09, 11, 1b, 0d, 1e, 02, 09, 0a, 01, 32, 01, 03, 0a, 28, 00, 03, 03, 08, 00, 15, 30, 05, 02, 01, 02, 03, 00, 09, 00, 0a, 02, 00, 0e, 00, 0f, 30, 09, 1e, 03, 02, 00, 00, 0e, 00, 0f, 0b, 00, 14, 00, 15, 30, 11, 0d, 02, 00, 00, 00, 14, 00, 15, 11, 00, 16, 02, 06, 1b, 02, 0c, 02, 06, 17, 03, 01, 00, 02]
+ Number of files: 1
+ - file 0 => global file 1
+ Number of expressions: 8
+@@ -112,7 +112,7 @@ Number of expressions: 8
+ - expression 6 operands: lhs = Counter(3), rhs = Expression(7, Sub)
+ - expression 7 operands: lhs = Expression(0, Sub), rhs = Counter(2)
+ Number of file 0 mappings: 10
+-- Code(Counter(0)) at (prev + 49, 1) to (start + 3, 10)
++- Code(Counter(0)) at (prev + 50, 1) to (start + 3, 10)
+ - MCDCDecision { bitmap_idx: 0, conditions_num: 3 } at (prev + 3, 8) to (start + 0, 21)
+ - MCDCBranch { true: Counter(1), false: Expression(0, Sub), condition_id: 1, true_next_id: 2, false_next_id: 3 } at (prev + 0, 9) to (start + 0, 10)
+     true  = c1
+@@ -134,7 +134,7 @@ Number of file 0 mappings: 10
+     = (c4 + (c3 + ((c0 - c1) - c2)))
+ 
+ Function name: if::mcdc_check_tree_decision
+-Raw bytes (87): 0x[01, 01, 08, 01, 05, 05, 0d, 05, 0d, 0d, 11, 09, 02, 1b, 1f, 0d, 11, 09, 02, 0a, 01, 27, 01, 03, 09, 28, 00, 03, 03, 08, 00, 15, 30, 05, 02, 01, 02, 00, 00, 08, 00, 09, 05, 00, 0e, 00, 0f, 30, 0d, 0a, 02, 00, 03, 00, 0e, 00, 0f, 0a, 00, 13, 00, 14, 30, 11, 09, 03, 00, 00, 00, 13, 00, 14, 1b, 00, 16, 02, 06, 1f, 02, 0c, 02, 06, 17, 03, 01, 00, 02]
++Raw bytes (87): 0x[01, 01, 08, 01, 05, 05, 0d, 05, 0d, 0d, 11, 09, 02, 1b, 1f, 0d, 11, 09, 02, 0a, 01, 28, 01, 03, 09, 28, 00, 03, 03, 08, 00, 15, 30, 05, 02, 01, 02, 00, 00, 08, 00, 09, 05, 00, 0e, 00, 0f, 30, 0d, 0a, 02, 00, 03, 00, 0e, 00, 0f, 0a, 00, 13, 00, 14, 30, 11, 09, 03, 00, 00, 00, 13, 00, 14, 1b, 00, 16, 02, 06, 1f, 02, 0c, 02, 06, 17, 03, 01, 00, 02]
+ Number of files: 1
+ - file 0 => global file 1
+ Number of expressions: 8
+@@ -147,7 +147,7 @@ Number of expressions: 8
+ - expression 6 operands: lhs = Counter(3), rhs = Counter(4)
+ - expression 7 operands: lhs = Counter(2), rhs = Expression(0, Sub)
+ Number of file 0 mappings: 10
+-- Code(Counter(0)) at (prev + 39, 1) to (start + 3, 9)
++- Code(Counter(0)) at (prev + 40, 1) to (start + 3, 9)
+ - MCDCDecision { bitmap_idx: 0, conditions_num: 3 } at (prev + 3, 8) to (start + 0, 21)
+ - MCDCBranch { true: Counter(1), false: Expression(0, Sub), condition_id: 1, true_next_id: 2, false_next_id: 0 } at (prev + 0, 8) to (start + 0, 9)
+     true  = c1
+@@ -169,7 +169,7 @@ Number of file 0 mappings: 10
+     = ((c3 + c4) + (c2 + (c0 - c1)))
+ 
+ Function name: if::mcdc_nested_if
+-Raw bytes (124): 0x[01, 01, 0d, 01, 05, 02, 09, 05, 09, 1b, 15, 05, 09, 1b, 15, 05, 09, 11, 15, 02, 09, 2b, 32, 0d, 2f, 11, 15, 02, 09, 0e, 01, 3b, 01, 01, 09, 28, 00, 02, 01, 08, 00, 0e, 30, 05, 02, 01, 00, 02, 00, 08, 00, 09, 02, 00, 0d, 00, 0e, 30, 09, 32, 02, 00, 00, 00, 0d, 00, 0e, 1b, 01, 09, 01, 0d, 28, 01, 02, 01, 0c, 00, 12, 30, 16, 15, 01, 02, 00, 00, 0c, 00, 0d, 16, 00, 11, 00, 12, 30, 0d, 11, 02, 00, 00, 00, 11, 00, 12, 0d, 00, 13, 02, 0a, 2f, 02, 0a, 00, 0b, 32, 01, 0c, 02, 06, 27, 03, 01, 00, 02]
++Raw bytes (124): 0x[01, 01, 0d, 01, 05, 02, 09, 05, 09, 1b, 15, 05, 09, 1b, 15, 05, 09, 11, 15, 02, 09, 2b, 32, 0d, 2f, 11, 15, 02, 09, 0e, 01, 3c, 01, 01, 09, 28, 00, 02, 01, 08, 00, 0e, 30, 05, 02, 01, 00, 02, 00, 08, 00, 09, 02, 00, 0d, 00, 0e, 30, 09, 32, 02, 00, 00, 00, 0d, 00, 0e, 1b, 01, 09, 01, 0d, 28, 01, 02, 01, 0c, 00, 12, 30, 16, 15, 01, 02, 00, 00, 0c, 00, 0d, 16, 00, 11, 00, 12, 30, 0d, 11, 02, 00, 00, 00, 11, 00, 12, 0d, 00, 13, 02, 0a, 2f, 02, 0a, 00, 0b, 32, 01, 0c, 02, 06, 27, 03, 01, 00, 02]
+ Number of files: 1
+ - file 0 => global file 1
+ Number of expressions: 13
+@@ -187,7 +187,7 @@ Number of expressions: 13
+ - expression 11 operands: lhs = Counter(4), rhs = Counter(5)
+ - expression 12 operands: lhs = Expression(0, Sub), rhs = Counter(2)
+ Number of file 0 mappings: 14
+-- Code(Counter(0)) at (prev + 59, 1) to (start + 1, 9)
++- Code(Counter(0)) at (prev + 60, 1) to (start + 1, 9)
+ - MCDCDecision { bitmap_idx: 0, conditions_num: 2 } at (prev + 1, 8) to (start + 0, 14)
+ - MCDCBranch { true: Counter(1), false: Expression(0, Sub), condition_id: 1, true_next_id: 0, false_next_id: 2 } at (prev + 0, 8) to (start + 0, 9)
+     true  = c1
+diff --git a/tests/coverage/mcdc/inlined_expressions.cov-map b/tests/coverage/mcdc/inlined_expressions.cov-map
+index 09b7291c9649..8bb488c0dc07 100644
+--- a/tests/coverage/mcdc/inlined_expressions.cov-map
++++ b/tests/coverage/mcdc/inlined_expressions.cov-map
+@@ -1,5 +1,5 @@
+ Function name: inlined_expressions::inlined_instance
+-Raw bytes (52): 0x[01, 01, 03, 01, 05, 0b, 02, 09, 0d, 06, 01, 08, 01, 01, 06, 28, 00, 02, 01, 05, 00, 0b, 30, 05, 02, 01, 02, 00, 00, 05, 00, 06, 05, 00, 0a, 00, 0b, 30, 09, 0d, 02, 00, 00, 00, 0a, 00, 0b, 07, 01, 01, 00, 02]
++Raw bytes (52): 0x[01, 01, 03, 01, 05, 0b, 02, 09, 0d, 06, 01, 09, 01, 01, 06, 28, 00, 02, 01, 05, 00, 0b, 30, 05, 02, 01, 02, 00, 00, 05, 00, 06, 05, 00, 0a, 00, 0b, 30, 09, 0d, 02, 00, 00, 00, 0a, 00, 0b, 07, 01, 01, 00, 02]
+ Number of files: 1
+ - file 0 => global file 1
+ Number of expressions: 3
+@@ -7,7 +7,7 @@ Number of expressions: 3
+ - expression 1 operands: lhs = Expression(2, Add), rhs = Expression(0, Sub)
+ - expression 2 operands: lhs = Counter(2), rhs = Counter(3)
+ Number of file 0 mappings: 6
+-- Code(Counter(0)) at (prev + 8, 1) to (start + 1, 6)
++- Code(Counter(0)) at (prev + 9, 1) to (start + 1, 6)
+ - MCDCDecision { bitmap_idx: 0, conditions_num: 2 } at (prev + 1, 5) to (start + 0, 11)
+ - MCDCBranch { true: Counter(1), false: Expression(0, Sub), condition_id: 1, true_next_id: 2, false_next_id: 0 } at (prev + 0, 5) to (start + 0, 6)
+     true  = c1
+diff --git a/tests/coverage/mcdc/nested_if.cov-map b/tests/coverage/mcdc/nested_if.cov-map
+index adeb6cbc1fb8..0bd2aef814c2 100644
+--- a/tests/coverage/mcdc/nested_if.cov-map
++++ b/tests/coverage/mcdc/nested_if.cov-map
+@@ -1,5 +1,5 @@
+ Function name: nested_if::doubly_nested_if_in_condition
+-Raw bytes (168): 0x[01, 01, 0e, 01, 05, 05, 11, 05, 11, 26, 19, 05, 11, 19, 1d, 19, 1d, 1d, 22, 26, 19, 05, 11, 11, 15, 09, 02, 0d, 37, 09, 02, 14, 01, 0f, 01, 01, 09, 28, 02, 02, 01, 08, 00, 4e, 30, 05, 02, 01, 02, 00, 00, 08, 00, 09, 30, 0d, 09, 02, 00, 00, 00, 0d, 00, 4e, 05, 00, 10, 00, 11, 28, 01, 02, 00, 10, 00, 36, 30, 11, 26, 01, 00, 02, 00, 10, 00, 11, 30, 15, 21, 02, 00, 00, 00, 15, 00, 36, 26, 00, 18, 00, 19, 28, 00, 02, 00, 18, 00, 1e, 30, 19, 22, 01, 02, 00, 00, 18, 00, 19, 19, 00, 1d, 00, 1e, 30, 1a, 1d, 02, 00, 00, 00, 1d, 00, 1e, 1a, 00, 21, 00, 25, 1f, 00, 2f, 00, 34, 2b, 00, 39, 00, 3e, 21, 00, 48, 00, 4c, 0d, 00, 4f, 02, 06, 37, 02, 0c, 02, 06, 33, 03, 01, 00, 02]
++Raw bytes (168): 0x[01, 01, 0e, 01, 05, 05, 11, 05, 11, 26, 19, 05, 11, 19, 1d, 19, 1d, 1d, 22, 26, 19, 05, 11, 11, 15, 09, 02, 0d, 37, 09, 02, 14, 01, 10, 01, 01, 09, 28, 02, 02, 01, 08, 00, 4e, 30, 05, 02, 01, 02, 00, 00, 08, 00, 09, 30, 0d, 09, 02, 00, 00, 00, 0d, 00, 4e, 05, 00, 10, 00, 11, 28, 01, 02, 00, 10, 00, 36, 30, 11, 26, 01, 00, 02, 00, 10, 00, 11, 30, 15, 21, 02, 00, 00, 00, 15, 00, 36, 26, 00, 18, 00, 19, 28, 00, 02, 00, 18, 00, 1e, 30, 19, 22, 01, 02, 00, 00, 18, 00, 19, 19, 00, 1d, 00, 1e, 30, 1a, 1d, 02, 00, 00, 00, 1d, 00, 1e, 1a, 00, 21, 00, 25, 1f, 00, 2f, 00, 34, 2b, 00, 39, 00, 3e, 21, 00, 48, 00, 4c, 0d, 00, 4f, 02, 06, 37, 02, 0c, 02, 06, 33, 03, 01, 00, 02]
+ Number of files: 1
+ - file 0 => global file 1
+ Number of expressions: 14
+@@ -18,7 +18,7 @@ Number of expressions: 14
+ - expression 12 operands: lhs = Counter(3), rhs = Expression(13, Add)
+ - expression 13 operands: lhs = Counter(2), rhs = Expression(0, Sub)
+ Number of file 0 mappings: 20
+-- Code(Counter(0)) at (prev + 15, 1) to (start + 1, 9)
++- Code(Counter(0)) at (prev + 16, 1) to (start + 1, 9)
+ - MCDCDecision { bitmap_idx: 2, conditions_num: 2 } at (prev + 1, 8) to (start + 0, 78)
+ - MCDCBranch { true: Counter(1), false: Expression(0, Sub), condition_id: 1, true_next_id: 2, false_next_id: 0 } at (prev + 0, 8) to (start + 0, 9)
+     true  = c1
+@@ -58,7 +58,7 @@ Number of file 0 mappings: 20
+     = (c3 + (c2 + (c0 - c1)))
+ 
+ Function name: nested_if::nested_if_in_condition
+-Raw bytes (120): 0x[01, 01, 0b, 01, 05, 05, 11, 05, 11, 1e, 15, 05, 11, 11, 15, 1e, 15, 05, 11, 09, 02, 0d, 2b, 09, 02, 0e, 01, 07, 01, 01, 09, 28, 01, 02, 01, 08, 00, 2e, 30, 05, 02, 01, 02, 00, 00, 08, 00, 09, 30, 0d, 09, 02, 00, 00, 00, 0d, 00, 2e, 05, 00, 10, 00, 11, 28, 00, 02, 00, 10, 00, 16, 30, 11, 1e, 01, 00, 02, 00, 10, 00, 11, 1e, 00, 15, 00, 16, 30, 15, 1a, 02, 00, 00, 00, 15, 00, 16, 17, 00, 19, 00, 1d, 1a, 00, 27, 00, 2c, 0d, 00, 2f, 02, 06, 2b, 02, 0c, 02, 06, 27, 03, 01, 00, 02]
++Raw bytes (120): 0x[01, 01, 0b, 01, 05, 05, 11, 05, 11, 1e, 15, 05, 11, 11, 15, 1e, 15, 05, 11, 09, 02, 0d, 2b, 09, 02, 0e, 01, 08, 01, 01, 09, 28, 01, 02, 01, 08, 00, 2e, 30, 05, 02, 01, 02, 00, 00, 08, 00, 09, 30, 0d, 09, 02, 00, 00, 00, 0d, 00, 2e, 05, 00, 10, 00, 11, 28, 00, 02, 00, 10, 00, 16, 30, 11, 1e, 01, 00, 02, 00, 10, 00, 11, 1e, 00, 15, 00, 16, 30, 15, 1a, 02, 00, 00, 00, 15, 00, 16, 17, 00, 19, 00, 1d, 1a, 00, 27, 00, 2c, 0d, 00, 2f, 02, 06, 2b, 02, 0c, 02, 06, 27, 03, 01, 00, 02]
+ Number of files: 1
+ - file 0 => global file 1
+ Number of expressions: 11
+@@ -74,7 +74,7 @@ Number of expressions: 11
+ - expression 9 operands: lhs = Counter(3), rhs = Expression(10, Add)
+ - expression 10 operands: lhs = Counter(2), rhs = Expression(0, Sub)
+ Number of file 0 mappings: 14
+-- Code(Counter(0)) at (prev + 7, 1) to (start + 1, 9)
++- Code(Counter(0)) at (prev + 8, 1) to (start + 1, 9)
+ - MCDCDecision { bitmap_idx: 1, conditions_num: 2 } at (prev + 1, 8) to (start + 0, 46)
+ - MCDCBranch { true: Counter(1), false: Expression(0, Sub), condition_id: 1, true_next_id: 2, false_next_id: 0 } at (prev + 0, 8) to (start + 0, 9)
+     true  = c1
+@@ -103,7 +103,7 @@ Number of file 0 mappings: 14
+     = (c3 + (c2 + (c0 - c1)))
+ 
+ Function name: nested_if::nested_in_then_block_in_condition
+-Raw bytes (176): 0x[01, 01, 12, 01, 05, 05, 11, 05, 11, 3a, 15, 05, 11, 11, 15, 33, 19, 11, 15, 19, 1d, 19, 1d, 1d, 2e, 33, 19, 11, 15, 3a, 15, 05, 11, 09, 02, 0d, 47, 09, 02, 14, 01, 22, 01, 01, 09, 28, 02, 02, 01, 08, 00, 4b, 30, 05, 02, 01, 02, 00, 00, 08, 00, 09, 30, 0d, 09, 02, 00, 00, 00, 0d, 00, 4b, 05, 00, 10, 00, 11, 28, 00, 02, 00, 10, 00, 16, 30, 11, 3a, 01, 00, 02, 00, 10, 00, 11, 3a, 00, 15, 00, 16, 30, 15, 36, 02, 00, 00, 00, 15, 00, 16, 33, 00, 1c, 00, 1d, 28, 01, 02, 00, 1c, 00, 22, 30, 19, 2e, 01, 02, 00, 00, 1c, 00, 1d, 19, 00, 21, 00, 22, 30, 26, 1d, 02, 00, 00, 00, 21, 00, 22, 26, 00, 25, 00, 29, 2b, 00, 33, 00, 38, 36, 00, 44, 00, 49, 0d, 00, 4c, 02, 06, 47, 02, 0c, 02, 06, 43, 03, 01, 00, 02]
++Raw bytes (176): 0x[01, 01, 12, 01, 05, 05, 11, 05, 11, 3a, 15, 05, 11, 11, 15, 33, 19, 11, 15, 19, 1d, 19, 1d, 1d, 2e, 33, 19, 11, 15, 3a, 15, 05, 11, 09, 02, 0d, 47, 09, 02, 14, 01, 23, 01, 01, 09, 28, 02, 02, 01, 08, 00, 4b, 30, 05, 02, 01, 02, 00, 00, 08, 00, 09, 30, 0d, 09, 02, 00, 00, 00, 0d, 00, 4b, 05, 00, 10, 00, 11, 28, 00, 02, 00, 10, 00, 16, 30, 11, 3a, 01, 00, 02, 00, 10, 00, 11, 3a, 00, 15, 00, 16, 30, 15, 36, 02, 00, 00, 00, 15, 00, 16, 33, 00, 1c, 00, 1d, 28, 01, 02, 00, 1c, 00, 22, 30, 19, 2e, 01, 02, 00, 00, 1c, 00, 1d, 19, 00, 21, 00, 22, 30, 26, 1d, 02, 00, 00, 00, 21, 00, 22, 26, 00, 25, 00, 29, 2b, 00, 33, 00, 38, 36, 00, 44, 00, 49, 0d, 00, 4c, 02, 06, 47, 02, 0c, 02, 06, 43, 03, 01, 00, 02]
+ Number of files: 1
+ - file 0 => global file 1
+ Number of expressions: 18
+@@ -126,7 +126,7 @@ Number of expressions: 18
+ - expression 16 operands: lhs = Counter(3), rhs = Expression(17, Add)
+ - expression 17 operands: lhs = Counter(2), rhs = Expression(0, Sub)
+ Number of file 0 mappings: 20
+-- Code(Counter(0)) at (prev + 34, 1) to (start + 1, 9)
++- Code(Counter(0)) at (prev + 35, 1) to (start + 1, 9)
+ - MCDCDecision { bitmap_idx: 2, conditions_num: 2 } at (prev + 1, 8) to (start + 0, 75)
+ - MCDCBranch { true: Counter(1), false: Expression(0, Sub), condition_id: 1, true_next_id: 2, false_next_id: 0 } at (prev + 0, 8) to (start + 0, 9)
+     true  = c1
+@@ -167,7 +167,7 @@ Number of file 0 mappings: 20
+     = (c3 + (c2 + (c0 - c1)))
+ 
+ Function name: nested_if::nested_single_condition_decision
+-Raw bytes (85): 0x[01, 01, 06, 01, 05, 05, 11, 05, 11, 09, 02, 0d, 17, 09, 02, 0b, 01, 17, 01, 04, 09, 28, 00, 02, 04, 08, 00, 29, 30, 05, 02, 01, 02, 00, 00, 08, 00, 09, 30, 0d, 09, 02, 00, 00, 00, 0d, 00, 29, 05, 00, 10, 00, 11, 20, 11, 0a, 00, 10, 00, 11, 11, 00, 14, 00, 19, 0a, 00, 23, 00, 27, 0d, 00, 2a, 02, 06, 17, 02, 0c, 02, 06, 13, 03, 01, 00, 02]
++Raw bytes (85): 0x[01, 01, 06, 01, 05, 05, 11, 05, 11, 09, 02, 0d, 17, 09, 02, 0b, 01, 18, 01, 04, 09, 28, 00, 02, 04, 08, 00, 29, 30, 05, 02, 01, 02, 00, 00, 08, 00, 09, 30, 0d, 09, 02, 00, 00, 00, 0d, 00, 29, 05, 00, 10, 00, 11, 20, 11, 0a, 00, 10, 00, 11, 11, 00, 14, 00, 19, 0a, 00, 23, 00, 27, 0d, 00, 2a, 02, 06, 17, 02, 0c, 02, 06, 13, 03, 01, 00, 02]
+ Number of files: 1
+ - file 0 => global file 1
+ Number of expressions: 6
+@@ -178,7 +178,7 @@ Number of expressions: 6
+ - expression 4 operands: lhs = Counter(3), rhs = Expression(5, Add)
+ - expression 5 operands: lhs = Counter(2), rhs = Expression(0, Sub)
+ Number of file 0 mappings: 11
+-- Code(Counter(0)) at (prev + 23, 1) to (start + 4, 9)
++- Code(Counter(0)) at (prev + 24, 1) to (start + 4, 9)
+ - MCDCDecision { bitmap_idx: 0, conditions_num: 2 } at (prev + 4, 8) to (start + 0, 41)
+ - MCDCBranch { true: Counter(1), false: Expression(0, Sub), condition_id: 1, true_next_id: 2, false_next_id: 0 } at (prev + 0, 8) to (start + 0, 9)
+     true  = c1
+diff --git a/tests/coverage/mcdc/non_control_flow.cov-map b/tests/coverage/mcdc/non_control_flow.cov-map
+index f8576831e75f..0c6928b684d6 100644
+--- a/tests/coverage/mcdc/non_control_flow.cov-map
++++ b/tests/coverage/mcdc/non_control_flow.cov-map
+@@ -1,5 +1,5 @@
+ Function name: non_control_flow::assign_3
+-Raw bytes (89): 0x[01, 01, 09, 05, 07, 0b, 11, 09, 0d, 01, 05, 01, 05, 22, 11, 01, 05, 22, 11, 01, 05, 0a, 01, 16, 01, 00, 28, 03, 01, 09, 00, 0a, 01, 00, 0d, 00, 0e, 28, 00, 03, 00, 0d, 00, 18, 30, 05, 22, 01, 00, 02, 00, 0d, 00, 0e, 22, 00, 12, 00, 13, 30, 1e, 11, 02, 03, 00, 00, 12, 00, 13, 1e, 00, 17, 00, 18, 30, 09, 0d, 03, 00, 00, 00, 17, 00, 18, 03, 01, 05, 01, 02]
++Raw bytes (89): 0x[01, 01, 09, 05, 07, 0b, 11, 09, 0d, 01, 05, 01, 05, 22, 11, 01, 05, 22, 11, 01, 05, 0a, 01, 17, 01, 00, 28, 03, 01, 09, 00, 0a, 01, 00, 0d, 00, 0e, 28, 00, 03, 00, 0d, 00, 18, 30, 05, 22, 01, 00, 02, 00, 0d, 00, 0e, 22, 00, 12, 00, 13, 30, 1e, 11, 02, 03, 00, 00, 12, 00, 13, 1e, 00, 17, 00, 18, 30, 09, 0d, 03, 00, 00, 00, 17, 00, 18, 03, 01, 05, 01, 02]
+ Number of files: 1
+ - file 0 => global file 1
+ Number of expressions: 9
+@@ -13,7 +13,7 @@ Number of expressions: 9
+ - expression 7 operands: lhs = Expression(8, Sub), rhs = Counter(4)
+ - expression 8 operands: lhs = Counter(0), rhs = Counter(1)
+ Number of file 0 mappings: 10
+-- Code(Counter(0)) at (prev + 22, 1) to (start + 0, 40)
++- Code(Counter(0)) at (prev + 23, 1) to (start + 0, 40)
+ - Code(Expression(0, Add)) at (prev + 1, 9) to (start + 0, 10)
+     = (c1 + ((c2 + c3) + c4))
+ - Code(Counter(0)) at (prev + 0, 13) to (start + 0, 14)
+@@ -35,7 +35,7 @@ Number of file 0 mappings: 10
+     = (c1 + ((c2 + c3) + c4))
+ 
+ Function name: non_control_flow::assign_3_bis
+-Raw bytes (85): 0x[01, 01, 07, 07, 11, 09, 0d, 01, 05, 05, 09, 16, 1a, 05, 09, 01, 05, 0a, 01, 1b, 01, 00, 2c, 03, 01, 09, 00, 0a, 01, 00, 0d, 00, 0e, 28, 00, 03, 00, 0d, 00, 18, 30, 05, 1a, 01, 03, 02, 00, 0d, 00, 0e, 05, 00, 12, 00, 13, 30, 09, 16, 03, 00, 02, 00, 12, 00, 13, 13, 00, 17, 00, 18, 30, 0d, 11, 02, 00, 00, 00, 17, 00, 18, 03, 01, 05, 01, 02]
++Raw bytes (85): 0x[01, 01, 07, 07, 11, 09, 0d, 01, 05, 05, 09, 16, 1a, 05, 09, 01, 05, 0a, 01, 1c, 01, 00, 2c, 03, 01, 09, 00, 0a, 01, 00, 0d, 00, 0e, 28, 00, 03, 00, 0d, 00, 18, 30, 05, 1a, 01, 03, 02, 00, 0d, 00, 0e, 05, 00, 12, 00, 13, 30, 09, 16, 03, 00, 02, 00, 12, 00, 13, 13, 00, 17, 00, 18, 30, 0d, 11, 02, 00, 00, 00, 17, 00, 18, 03, 01, 05, 01, 02]
+ Number of files: 1
+ - file 0 => global file 1
+ Number of expressions: 7
+@@ -47,7 +47,7 @@ Number of expressions: 7
+ - expression 5 operands: lhs = Counter(1), rhs = Counter(2)
+ - expression 6 operands: lhs = Counter(0), rhs = Counter(1)
+ Number of file 0 mappings: 10
+-- Code(Counter(0)) at (prev + 27, 1) to (start + 0, 44)
++- Code(Counter(0)) at (prev + 28, 1) to (start + 0, 44)
+ - Code(Expression(0, Add)) at (prev + 1, 9) to (start + 0, 10)
+     = ((c2 + c3) + c4)
+ - Code(Counter(0)) at (prev + 0, 13) to (start + 0, 14)
+@@ -68,7 +68,7 @@ Number of file 0 mappings: 10
+     = ((c2 + c3) + c4)
+ 
+ Function name: non_control_flow::assign_and
+-Raw bytes (64): 0x[01, 01, 04, 07, 0e, 09, 0d, 01, 05, 01, 05, 08, 01, 0c, 01, 00, 21, 03, 01, 09, 00, 0a, 01, 00, 0d, 00, 0e, 28, 00, 02, 00, 0d, 00, 13, 30, 05, 0e, 01, 02, 00, 00, 0d, 00, 0e, 05, 00, 12, 00, 13, 30, 09, 0d, 02, 00, 00, 00, 12, 00, 13, 03, 01, 05, 01, 02]
++Raw bytes (64): 0x[01, 01, 04, 07, 0e, 09, 0d, 01, 05, 01, 05, 08, 01, 0d, 01, 00, 21, 03, 01, 09, 00, 0a, 01, 00, 0d, 00, 0e, 28, 00, 02, 00, 0d, 00, 13, 30, 05, 0e, 01, 02, 00, 00, 0d, 00, 0e, 05, 00, 12, 00, 13, 30, 09, 0d, 02, 00, 00, 00, 12, 00, 13, 03, 01, 05, 01, 02]
+ Number of files: 1
+ - file 0 => global file 1
+ Number of expressions: 4
+@@ -77,7 +77,7 @@ Number of expressions: 4
+ - expression 2 operands: lhs = Counter(0), rhs = Counter(1)
+ - expression 3 operands: lhs = Counter(0), rhs = Counter(1)
+ Number of file 0 mappings: 8
+-- Code(Counter(0)) at (prev + 12, 1) to (start + 0, 33)
++- Code(Counter(0)) at (prev + 13, 1) to (start + 0, 33)
+ - Code(Expression(0, Add)) at (prev + 1, 9) to (start + 0, 10)
+     = ((c2 + c3) + (c0 - c1))
+ - Code(Counter(0)) at (prev + 0, 13) to (start + 0, 14)
+@@ -93,7 +93,7 @@ Number of file 0 mappings: 8
+     = ((c2 + c3) + (c0 - c1))
+ 
+ Function name: non_control_flow::assign_or
+-Raw bytes (64): 0x[01, 01, 04, 07, 0d, 05, 09, 01, 05, 01, 05, 08, 01, 11, 01, 00, 20, 03, 01, 09, 00, 0a, 01, 00, 0d, 00, 0e, 28, 00, 02, 00, 0d, 00, 13, 30, 05, 0e, 01, 00, 02, 00, 0d, 00, 0e, 0e, 00, 12, 00, 13, 30, 09, 0d, 02, 00, 00, 00, 12, 00, 13, 03, 01, 05, 01, 02]
++Raw bytes (64): 0x[01, 01, 04, 07, 0d, 05, 09, 01, 05, 01, 05, 08, 01, 12, 01, 00, 20, 03, 01, 09, 00, 0a, 01, 00, 0d, 00, 0e, 28, 00, 02, 00, 0d, 00, 13, 30, 05, 0e, 01, 00, 02, 00, 0d, 00, 0e, 0e, 00, 12, 00, 13, 30, 09, 0d, 02, 00, 00, 00, 12, 00, 13, 03, 01, 05, 01, 02]
+ Number of files: 1
+ - file 0 => global file 1
+ Number of expressions: 4
+@@ -102,7 +102,7 @@ Number of expressions: 4
+ - expression 2 operands: lhs = Counter(0), rhs = Counter(1)
+ - expression 3 operands: lhs = Counter(0), rhs = Counter(1)
+ Number of file 0 mappings: 8
+-- Code(Counter(0)) at (prev + 17, 1) to (start + 0, 32)
++- Code(Counter(0)) at (prev + 18, 1) to (start + 0, 32)
+ - Code(Expression(0, Add)) at (prev + 1, 9) to (start + 0, 10)
+     = ((c1 + c2) + c3)
+ - Code(Counter(0)) at (prev + 0, 13) to (start + 0, 14)
+@@ -119,15 +119,15 @@ Number of file 0 mappings: 8
+     = ((c1 + c2) + c3)
+ 
+ Function name: non_control_flow::foo
+-Raw bytes (9): 0x[01, 01, 00, 01, 01, 25, 01, 02, 02]
++Raw bytes (9): 0x[01, 01, 00, 01, 01, 26, 01, 02, 02]
+ Number of files: 1
+ - file 0 => global file 1
+ Number of expressions: 0
+ Number of file 0 mappings: 1
+-- Code(Counter(0)) at (prev + 37, 1) to (start + 2, 2)
++- Code(Counter(0)) at (prev + 38, 1) to (start + 2, 2)
+ 
+ Function name: non_control_flow::func_call
+-Raw bytes (52): 0x[01, 01, 03, 01, 05, 0b, 02, 09, 0d, 06, 01, 29, 01, 01, 0a, 28, 00, 02, 01, 09, 00, 0f, 30, 05, 02, 01, 02, 00, 00, 09, 00, 0a, 05, 00, 0e, 00, 0f, 30, 09, 0d, 02, 00, 00, 00, 0e, 00, 0f, 07, 01, 01, 00, 02]
++Raw bytes (52): 0x[01, 01, 03, 01, 05, 0b, 02, 09, 0d, 06, 01, 2a, 01, 01, 0a, 28, 00, 02, 01, 09, 00, 0f, 30, 05, 02, 01, 02, 00, 00, 09, 00, 0a, 05, 00, 0e, 00, 0f, 30, 09, 0d, 02, 00, 00, 00, 0e, 00, 0f, 07, 01, 01, 00, 02]
+ Number of files: 1
+ - file 0 => global file 1
+ Number of expressions: 3
+@@ -135,7 +135,7 @@ Number of expressions: 3
+ - expression 1 operands: lhs = Expression(2, Add), rhs = Expression(0, Sub)
+ - expression 2 operands: lhs = Counter(2), rhs = Counter(3)
+ Number of file 0 mappings: 6
+-- Code(Counter(0)) at (prev + 41, 1) to (start + 1, 10)
++- Code(Counter(0)) at (prev + 42, 1) to (start + 1, 10)
+ - MCDCDecision { bitmap_idx: 0, conditions_num: 2 } at (prev + 1, 9) to (start + 0, 15)
+ - MCDCBranch { true: Counter(1), false: Expression(0, Sub), condition_id: 1, true_next_id: 2, false_next_id: 0 } at (prev + 0, 9) to (start + 0, 10)
+     true  = c1
+@@ -148,7 +148,7 @@ Number of file 0 mappings: 6
+     = ((c2 + c3) + (c0 - c1))
+ 
+ Function name: non_control_flow::right_comb_tree
+-Raw bytes (139): 0x[01, 01, 13, 07, 1a, 0b, 19, 0f, 15, 13, 11, 09, 0d, 01, 05, 01, 05, 05, 19, 05, 19, 4a, 15, 05, 19, 4a, 15, 05, 19, 46, 11, 4a, 15, 05, 19, 46, 11, 4a, 15, 05, 19, 0e, 01, 20, 01, 00, 41, 03, 01, 09, 00, 0a, 01, 00, 0d, 00, 0e, 28, 00, 05, 00, 0d, 00, 2a, 30, 05, 1a, 01, 02, 00, 00, 0d, 00, 0e, 05, 00, 13, 00, 14, 30, 4a, 19, 02, 03, 00, 00, 13, 00, 14, 4a, 00, 19, 00, 1a, 30, 46, 15, 03, 04, 00, 00, 19, 00, 1a, 46, 00, 1f, 00, 20, 30, 42, 11, 04, 05, 00, 00, 1f, 00, 20, 42, 00, 24, 00, 27, 30, 09, 0d, 05, 00, 00, 00, 24, 00, 27, 03, 01, 05, 01, 02]
++Raw bytes (139): 0x[01, 01, 13, 07, 1a, 0b, 19, 0f, 15, 13, 11, 09, 0d, 01, 05, 01, 05, 05, 19, 05, 19, 4a, 15, 05, 19, 4a, 15, 05, 19, 46, 11, 4a, 15, 05, 19, 46, 11, 4a, 15, 05, 19, 0e, 01, 21, 01, 00, 41, 03, 01, 09, 00, 0a, 01, 00, 0d, 00, 0e, 28, 00, 05, 00, 0d, 00, 2a, 30, 05, 1a, 01, 02, 00, 00, 0d, 00, 0e, 05, 00, 13, 00, 14, 30, 4a, 19, 02, 03, 00, 00, 13, 00, 14, 4a, 00, 19, 00, 1a, 30, 46, 15, 03, 04, 00, 00, 19, 00, 1a, 46, 00, 1f, 00, 20, 30, 42, 11, 04, 05, 00, 00, 1f, 00, 20, 42, 00, 24, 00, 27, 30, 09, 0d, 05, 00, 00, 00, 24, 00, 27, 03, 01, 05, 01, 02]
+ Number of files: 1
+ - file 0 => global file 1
+ Number of expressions: 19
+@@ -172,7 +172,7 @@ Number of expressions: 19
+ - expression 17 operands: lhs = Expression(18, Sub), rhs = Counter(5)
+ - expression 18 operands: lhs = Counter(1), rhs = Counter(6)
+ Number of file 0 mappings: 14
+-- Code(Counter(0)) at (prev + 32, 1) to (start + 0, 65)
++- Code(Counter(0)) at (prev + 33, 1) to (start + 0, 65)
+ - Code(Expression(0, Add)) at (prev + 1, 9) to (start + 0, 10)
+     = (((((c2 + c3) + c4) + c5) + c6) + (c0 - c1))
+ - Code(Counter(0)) at (prev + 0, 13) to (start + 0, 14)
+-- 
+2.46.1
+
diff --git a/rustc-1.80.0-disable-libssh2.patch b/rustc-1.81.0-disable-libssh2.patch
similarity index 54%
rename from rustc-1.80.0-disable-libssh2.patch
rename to rustc-1.81.0-disable-libssh2.patch
index 85061b4..abee3c3 100644
--- a/rustc-1.80.0-disable-libssh2.patch
+++ b/rustc-1.81.0-disable-libssh2.patch
@@ -1,7 +1,7 @@
 diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock
---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2024-07-05 18:14:51.101370053 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2024-07-05 18:14:51.104370020 -0700
-@@ -2151,7 +2151,6 @@ checksum = "ee4126d8b4ee5c9d9ea891dd875c
+--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2024-08-26 09:03:52.769956890 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2024-08-26 09:03:52.773956573 -0700
+@@ -2155,7 +2155,6 @@ checksum = "10472326a8a6477c3c20a64547b0
  dependencies = [
   "cc",
   "libc",
@@ -9,7 +9,7 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools
   "libz-sys",
   "openssl-sys",
   "pkg-config",
-@@ -2192,20 +2191,6 @@ dependencies = [
+@@ -2196,20 +2195,6 @@ dependencies = [
   "pkg-config",
   "vcpkg",
  ]
@@ -31,14 +31,14 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools
  [[package]]
  name = "libz-sys"
 diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml
---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2024-07-05 18:14:51.104370020 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2024-07-05 18:15:36.584867840 -0700
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2024-08-26 09:03:52.773956573 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2024-08-26 09:05:08.595934397 -0700
 @@ -44,7 +44,7 @@ curl = "0.4.46"
  curl-sys = "0.4.72"
  filetime = "0.2.23"
  flate2 = { version = "1.0.30", default-features = false, features = ["zlib"] }
--git2 = "0.18.3"
-+git2 = { version = "0.18.3", default-features = false, features = ["https"] }
- git2-curl = "0.19.0"
- gix = { version = "0.63.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision", "parallel", "dirwalk"] }
+-git2 = "0.19.0"
++git2 = { version = "0.19.0", default-features = false, features = ["https"] }
+ git2-curl = "0.20.0"
+ gix = { version = "0.64.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] }
  glob = "0.3.1"
diff --git a/rustc-1.80.0-unbundle-sqlite.patch b/rustc-1.81.0-unbundle-sqlite.patch
similarity index 61%
rename from rustc-1.80.0-unbundle-sqlite.patch
rename to rustc-1.81.0-unbundle-sqlite.patch
index d38128d..ec3ed1e 100644
--- a/rustc-1.80.0-unbundle-sqlite.patch
+++ b/rustc-1.81.0-unbundle-sqlite.patch
@@ -1,7 +1,7 @@
 diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock
---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2006-07-23 18:21:28.000000000 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2024-07-05 18:09:20.585019493 -0700
-@@ -2189,7 +2189,6 @@ version = "0.28.0"
+--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2024-08-15 09:53:53.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2024-08-16 10:20:52.394575295 -0700
+@@ -2195,7 +2195,6 @@ version = "0.28.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f"
  dependencies = [
@@ -10,10 +10,10 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools
   "vcpkg",
  ]
 diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml
---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2024-07-05 18:09:20.585019493 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2024-07-05 18:10:13.753432408 -0700
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2024-08-16 10:20:52.394575295 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2024-08-16 10:21:50.535122479 -0700
 @@ -77,7 +77,7 @@ proptest = "1.4.0"
- pulldown-cmark = { version = "0.10.3", default-features = false, features = ["html"] }
+ pulldown-cmark = { version = "0.11.0", default-features = false, features = ["html"] }
  rand = "0.8.5"
  regex = "1.10.4"
 -rusqlite = { version = "0.31.0", features = ["bundled"] }
diff --git a/sources b/sources
index c7d3d82..140bdf7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (rustc-1.80.1-src.tar.xz) = 3c746108a86eeb734c1a8c8f63ba1a45e2cb03a8cb553395a167d07dc3ce5d8d9ea365ddd95533b6952d915069b86cad7ad218d27861e0889f8e878136bd32ab
-SHA512 (wasi-libc-wasi-sdk-22.tar.gz) = 3fcd5d6c0e09d824702165d8f1236e400b1d5e95fad14f1821d40de05340a044f0ec8a587d8478854252cc938a663aa9f854e6a5e683ef8f8349c60dc6c628ed
+SHA512 (rustc-1.81.0-src.tar.xz) = b8a837ced521d2ca2c7f228a0640da591384519e4dbc1ae768524d50616da6abbd2f7bdae3777caebc0447dac91bf76481282ce5a2264d7f30e173caa6321a51
+SHA512 (wasi-libc-b9ef79d7dbd47c6c5bafdae760823467c2f60b70.tar.gz) = 089ee1f9faeccae85697823d415e34aac56df28cd9db99952a148cb9f91532edbae4ea78f8cd9a223903caadeeb17cbc31d55ea65b020692e4841ddf3914821e