diff options
| author | bors <bors@rust-lang.org> | 2024-03-17 08:44:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-03-17 08:44:44 +0000 |
| commit | ecdea9e9438cdb8cf707e7f60e066eda02344d05 (patch) | |
| tree | 75a8849ebe559afe5e37ec67f9ce100221d159eb /compiler/rustc_codegen_llvm/src/llvm_util.rs | |
| parent | 1eb882ef6d8630109c7b7ea5dcc5ef1c504bb976 (diff) | |
| parent | 325678c979f3614a342e3439be72524b1b00dd8f (diff) | |
| download | rust-ecdea9e9438cdb8cf707e7f60e066eda02344d05.tar.gz rust-ecdea9e9438cdb8cf707e7f60e066eda02344d05.zip | |
Auto merge of #122625 - matthiaskrgr:rollup-ue4dmnx, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #119411 (Add as_(mut_)ptr and as_(mut_)slice to raw array pointers) - #122248 (Respect stage0 sysroot when compiling rmake.rs with COMPILETEST_FORCE_STAGE0) - #122295 (mir-opt: always run tests for the current target) - #122574 (Register LLVM handlers for bad-alloc / OOM) - #122608 (Move check-cfg diagnostic logic into a separate file) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/llvm_util.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm_util.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/llvm_util.rs b/compiler/rustc_codegen_llvm/src/llvm_util.rs index e32c38644aa..c9e62e504ae 100644 --- a/compiler/rustc_codegen_llvm/src/llvm_util.rs +++ b/compiler/rustc_codegen_llvm/src/llvm_util.rs @@ -49,7 +49,7 @@ unsafe fn configure_llvm(sess: &Session) { let mut llvm_c_strs = Vec::with_capacity(n_args + 1); let mut llvm_args = Vec::with_capacity(n_args + 1); - llvm::LLVMRustInstallFatalErrorHandler(); + llvm::LLVMRustInstallErrorHandlers(); // On Windows, an LLVM assertion will open an Abort/Retry/Ignore dialog // box for the purpose of launching a debugger. However, on CI this will // cause it to hang until it times out, which can take several hours. |