Auto merge of #127513 - nikic:llvm-19, r=<try>

Update to LLVM 19 r? `@ghost`
rust-lang · Jul 9, 2024 · d009d2d · d009d2d
2 parents 5be2ec7 + a23e9a5
commit d009d2d
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -32,8 +32,8 @@
  shallow = true
 [submodule "src/llvm-project"]
  path = src/llvm-project
- url = https:/rust-lang/llvm-project.git
- branch = rustc/18.1-2024-05-19
+ url = https:/nikic/llvm-project.git
+ branch = rust-llvm-19
  shallow = true
 [submodule "src/doc/embedded-book"]
  path = src/doc/embedded-book

diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
@@ -1562,11 +1562,11 @@ 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
- report_fatal_error("LLVM 18.0 is required for mcdc intrinsic functions");
+ report_fatal_error("The instrprof_mcdc_condbitmap_update only exists in LLVM 18");
 #endif
 }
 

diff --git a/src/llvm-project b/src/llvm-project
diff --git a/tests/codegen/vec-in-place.rs b/tests/codegen/vec-in-place.rs
@@ -1,5 +1,6 @@
 //@ ignore-debug: FIXME: checks for call detect scoped noalias metadata
 //@ compile-flags: -O -Z merge-functions=disabled
+//@ ignore-llvm-version: 19-99
 #![crate_type = "lib"]
 
 // Ensure that trivial casts of vec elements are O(1)

diff --git 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
@@ -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-mcdc
 

diff --git 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-mcdc
 

diff --git 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-mcdc