diff options
| author | The Miri Cronjob Bot <miri@cron.bot> | 2024-03-29 05:02:09 +0000 |
|---|---|---|
| committer | The Miri Cronjob Bot <miri@cron.bot> | 2024-03-29 05:02:09 +0000 |
| commit | ed29546a27db9fa024c6f99a7dd001e86d75e14f (patch) | |
| tree | a5635c4d1821e9114fe7cc27d00353f98cac5402 /compiler/rustc_llvm/llvm-wrapper | |
| parent | 29a59beaa6bc7841b12d6523bd638dbd6e7d0b01 (diff) | |
| parent | 5eb78c515c777c232c35b2e606bcec7cefe875af (diff) | |
| download | rust-ed29546a27db9fa024c6f99a7dd001e86d75e14f.tar.gz rust-ed29546a27db9fa024c6f99a7dd001e86d75e14f.zip | |
Merge from rustc
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper')
| -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; |