Skip to content

Commit d009d2d

Browse files
committed
Auto merge of #127513 - nikic:llvm-19, r=<try>
Update to LLVM 19 r? `@ghost`
2 parents 5be2ec7 + a23e9a5 commit d009d2d

File tree

8 files changed

+10
-5
lines changed

8 files changed

+10
-5
lines changed

.gitmodules

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
shallow = true
3333
[submodule "src/llvm-project"]
3434
path = src/llvm-project
35-
url = https://github.com/rust-lang/llvm-project.git
36-
branch = rustc/18.1-2024-05-19
35+
url = https://github.com/nikic/llvm-project.git
36+
branch = rust-llvm-19
3737
shallow = true
3838
[submodule "src/doc/embedded-book"]
3939
path = src/doc/embedded-book

compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1562,11 +1562,11 @@ LLVMRustGetInstrProfMCDCTVBitmapUpdateIntrinsic(LLVMModuleRef M) {
15621562

15631563
extern "C" LLVMValueRef
15641564
LLVMRustGetInstrProfMCDCCondBitmapIntrinsic(LLVMModuleRef M) {
1565-
#if LLVM_VERSION_GE(18, 0)
1565+
#if LLVM_VERSION_GE(18, 0) && LLVM_VERSION_LT(19, 0)
15661566
return wrap(llvm::Intrinsic::getDeclaration(
15671567
unwrap(M), llvm::Intrinsic::instrprof_mcdc_condbitmap_update));
15681568
#else
1569-
report_fatal_error("LLVM 18.0 is required for mcdc intrinsic functions");
1569+
report_fatal_error("The instrprof_mcdc_condbitmap_update only exists in LLVM 18");
15701570
#endif
15711571
}
15721572

src/llvm-project

tests/codegen/vec-in-place.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
//@ ignore-debug: FIXME: checks for call detect scoped noalias metadata
22
//@ compile-flags: -O -Z merge-functions=disabled
3+
//@ ignore-llvm-version: 19-99
34
#![crate_type = "lib"]
45

56
// Ensure that trivial casts of vec elements are O(1)

tests/coverage/mcdc/condition-limit.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#![feature(coverage_attribute)]
22
//@ edition: 2021
33
//@ min-llvm-version: 18
4+
//@ ignore-llvm-version: 19-99
45
//@ compile-flags: -Zcoverage-options=mcdc
56
//@ llvm-cov-flags: --show-branches=count --show-mcdc
67

tests/coverage/mcdc_if.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#![feature(coverage_attribute)]
22
//@ edition: 2021
33
//@ min-llvm-version: 18
4+
//@ ignore-llvm-version: 19-99
45
//@ compile-flags: -Zcoverage-options=mcdc
56
//@ llvm-cov-flags: --show-mcdc
67

tests/coverage/mcdc_nested_if.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#![feature(coverage_attribute)]
22
//@ edition: 2021
33
//@ min-llvm-version: 18
4+
//@ ignore-llvm-version: 19-99
45
//@ compile-flags: -Zcoverage-options=mcdc
56
//@ llvm-cov-flags: --show-mcdc
67

tests/coverage/mcdc_non_control_flow.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#![feature(coverage_attribute)]
22
//@ edition: 2021
33
//@ min-llvm-version: 18
4+
//@ ignore-llvm-version: 19-99
45
//@ compile-flags: -Zcoverage-options=mcdc
56
//@ llvm-cov-flags: --show-mcdc
67

0 commit comments

Comments
 (0)