bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

keep noinline for system llvm < 14

Browse source
This commit is contained in:
Erik Desjardins 2021-12-29 23:19:55 -05:00
parent 2b662217e7
commit e4463b2453
9 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_codegen_llvm/src/builder.rs
View file

@ -1201,8 +1201,15 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
unsafe { llvm::LLVMBuildZExt(self.llbuilder, val, dest_ty, UNNAMED) }
}
fn mark_callsite_cold(&mut self, llret: &'ll Value) {
fn apply_attrs_to_cleanup_callsite(&mut self, llret: &'ll Value) {
// Cleanup is always the cold path.
llvm::Attribute::Cold.apply_callsite(llvm::AttributePlace::Function, llret);
// In LLVM versions with deferred inlining (currently, system LLVM < 14),
// inlining drop glue can lead to exponential size blowup, see #41696 and #92110.
if !llvm_util::is_rust_llvm() && llvm_util::get_version() < (14, 0, 0) {
llvm::Attribute::NoInline.apply_callsite(llvm::AttributePlace::Function, llret);
}
}
}

2
compiler/rustc_codegen_llvm/src/llvm/ffi.rs
View file

@ -1902,6 +1902,8 @@ extern "C" {
pub fn LLVMRustVersionMinor() -> u32;
pub fn LLVMRustVersionPatch() -> u32;
pub fn LLVMRustIsRustLLVM() -> bool;
pub fn LLVMRustAddModuleFlag(M: &Module, name: *const c_char, value: u32);
pub fn LLVMRustMetadataAsValue<'a>(C: &'a Context, MD: &'a Metadata) -> &'a Value;

6
compiler/rustc_codegen_llvm/src/llvm_util.rs
View file

@ -217,6 +217,12 @@ pub fn get_version() -> (u32, u32, u32) {
}
}
/// Returns `true` if this LLVM is Rust's bundled LLVM (and not system LLVM).
pub fn is_rust_llvm() -> bool {
// Can be called without initializing LLVM
unsafe { llvm::LLVMRustIsRustLLVM() }
}
pub fn print_passes() {
// Can be called without initializing LLVM
unsafe {