diff options
| author | bors <bors@rust-lang.org> | 2024-03-29 06:16:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-03-29 06:16:56 +0000 |
| commit | eae940fcef7f95d31b566f92f511f91f24f2f703 (patch) | |
| tree | a5635c4d1821e9114fe7cc27d00353f98cac5402 /compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | |
| parent | 58a771ebfa2e59f48cb50229049487c6550b2f7b (diff) | |
| parent | ed29546a27db9fa024c6f99a7dd001e86d75e14f (diff) | |
| download | rust-eae940fcef7f95d31b566f92f511f91f24f2f703.tar.gz rust-eae940fcef7f95d31b566f92f511f91f24f2f703.zip | |
Auto merge of #3427 - rust-lang:rustup-2024-03-29, r=saethlin
Automatic Rustup
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp index f6ec410bfac..8ec1f5a99e7 100644 --- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp @@ -1992,7 +1992,11 @@ extern "C" void LLVMRustContextConfigureDiagnosticHandler( } } if (DiagnosticHandlerCallback) { +#if LLVM_VERSION_GE(19, 0) + DiagnosticHandlerCallback(&DI, DiagnosticHandlerContext); +#else DiagnosticHandlerCallback(DI, DiagnosticHandlerContext); +#endif return true; } return false; |