diff options
| author | bors <bors@rust-lang.org> | 2022-03-18 03:01:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-03-18 03:01:46 +0000 |
| commit | d6f3a4ecb48ead838638e902f2fa4e5f3059779b (patch) | |
| tree | a0ced664fbcf095dac8d3b0a498b9ce8b335cb53 /compiler/rustc_codegen_llvm/src/allocator.rs | |
| parent | cd119057160cedea245aa2679add56723f3dc784 (diff) | |
| parent | 0254e318b820d79bb448d4d22d93e345e67b25eb (diff) | |
| download | rust-d6f3a4ecb48ead838638e902f2fa4e5f3059779b.tar.gz rust-d6f3a4ecb48ead838638e902f2fa4e5f3059779b.zip | |
Auto merge of #88098 - Amanieu:oom_panic, r=nagisa
Implement -Z oom=panic This PR removes the `#[rustc_allocator_nounwind]` attribute on `alloc_error_handler` which allows it to unwind with a panic instead of always aborting. This is then used to implement `-Z oom=panic` as per RFC 2116 (tracking issue #43596). Perf and binary size tests show negligible impact.
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/allocator.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/allocator.rs | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/allocator.rs b/compiler/rustc_codegen_llvm/src/allocator.rs index b647cfa5f4a..f935acb1a7e 100644 --- a/compiler/rustc_codegen_llvm/src/allocator.rs +++ b/compiler/rustc_codegen_llvm/src/allocator.rs @@ -3,7 +3,7 @@ use libc::c_uint; use rustc_ast::expand::allocator::{AllocatorKind, AllocatorTy, ALLOCATOR_METHODS}; use rustc_middle::bug; use rustc_middle::ty::TyCtxt; -use rustc_session::config::DebugInfo; +use rustc_session::config::{DebugInfo, OomStrategy}; use rustc_span::symbol::sym; use crate::debuginfo; @@ -139,6 +139,16 @@ pub(crate) unsafe fn codegen( llvm::LLVMBuildRetVoid(llbuilder); llvm::LLVMDisposeBuilder(llbuilder); + // __rust_alloc_error_handler_should_panic + let name = OomStrategy::SYMBOL; + let ll_g = llvm::LLVMRustGetOrInsertGlobal(llmod, name.as_ptr().cast(), name.len(), i8); + if tcx.sess.target.default_hidden_visibility { + llvm::LLVMRustSetVisibility(ll_g, llvm::Visibility::Hidden); + } + let val = tcx.sess.opts.debugging_opts.oom.should_panic(); + let llval = llvm::LLVMConstInt(i8, val as u64, False); + llvm::LLVMSetInitializer(ll_g, llval); + if tcx.sess.opts.debuginfo != DebugInfo::None { let dbg_cx = debuginfo::CodegenUnitDebugContext::new(llmod); debuginfo::metadata::build_compile_unit_di_node(tcx, module_name, &dbg_cx); |
