diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-04-25 06:46:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-25 06:46:50 +0200 |
| commit | 2d72abc8f24d0af3b0344cbee14130eaaf90f75f (patch) | |
| tree | 66afe302b8efddeef9f8a787ab8c97f1e7d74102 /compiler/rustc_codegen_llvm/src/lib.rs | |
| parent | 2212354865ed06612db04afda3f245f1488302e4 (diff) | |
| parent | 23a363821de3276747b27754bd0dd03a32991187 (diff) | |
| download | rust-2d72abc8f24d0af3b0344cbee14130eaaf90f75f.tar.gz rust-2d72abc8f24d0af3b0344cbee14130eaaf90f75f.zip | |
Rollup merge of #110782 - matthiaskrgr:revert_panic_oom, r=Amanieu
Revert panic oom This temporarily reverts https://github.com/rust-lang/rust/pull/109507 until https://github.com/rust-lang/rust/issues/110771 is addressed r? `@Amanieu`
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/lib.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/lib.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/lib.rs b/compiler/rustc_codegen_llvm/src/lib.rs index 00b2dc1287a..8305a0a4c28 100644 --- a/compiler/rustc_codegen_llvm/src/lib.rs +++ b/compiler/rustc_codegen_llvm/src/lib.rs @@ -115,10 +115,11 @@ impl ExtraBackendMethods for LlvmCodegenBackend { tcx: TyCtxt<'tcx>, module_name: &str, kind: AllocatorKind, + alloc_error_handler_kind: AllocatorKind, ) -> ModuleLlvm { let mut module_llvm = ModuleLlvm::new_metadata(tcx, module_name); unsafe { - allocator::codegen(tcx, &mut module_llvm, module_name, kind); + allocator::codegen(tcx, &mut module_llvm, module_name, kind, alloc_error_handler_kind); } module_llvm } |