1
Fork 0

Don't compute optimized PointerKind for unoptimized builds

This saves us both the Freeze/Unpin queries, and avoids placing
noalias attributes, which have a compile-time impact on LLVM
even in optnone builds (due to always_inline functions).
This commit is contained in:
Nikita Popov 2021-03-19 22:49:51 +01:00
parent 39ed64399e
commit 6ac229ca21
4 changed files with 27 additions and 20 deletions

View file

@ -11,7 +11,7 @@ use rustc_hir as hir;
use rustc_hir::lang_items::LangItem; use rustc_hir::lang_items::LangItem;
use rustc_index::bit_set::BitSet; use rustc_index::bit_set::BitSet;
use rustc_index::vec::{Idx, IndexVec}; use rustc_index::vec::{Idx, IndexVec};
use rustc_session::{DataTypeKind, FieldInfo, SizeKind, VariantInfo}; use rustc_session::{config::OptLevel, DataTypeKind, FieldInfo, SizeKind, VariantInfo};
use rustc_span::symbol::{Ident, Symbol}; use rustc_span::symbol::{Ident, Symbol};
use rustc_span::DUMMY_SP; use rustc_span::DUMMY_SP;
use rustc_target::abi::call::{ use rustc_target::abi::call::{
@ -2318,7 +2318,13 @@ where
ty::Ref(_, ty, mt) if offset.bytes() == 0 => { ty::Ref(_, ty, mt) if offset.bytes() == 0 => {
let address_space = addr_space_of_ty(ty); let address_space = addr_space_of_ty(ty);
let tcx = cx.tcx(); let tcx = cx.tcx();
let kind = match mt { let kind = if tcx.sess.opts.optimize == OptLevel::No {
// Use conservative pointer kind if not optimizing. This saves us the
// Freeze/Unpin queries, and can save time in the codegen backend (noalias
// attributes in LLVM have compile-time cost even in unoptimized builds).
PointerKind::Shared
} else {
match mt {
hir::Mutability::Not => { hir::Mutability::Not => {
if ty.is_freeze(tcx.at(DUMMY_SP), cx.param_env()) { if ty.is_freeze(tcx.at(DUMMY_SP), cx.param_env()) {
PointerKind::Frozen PointerKind::Frozen
@ -2337,6 +2343,7 @@ where
PointerKind::Shared PointerKind::Shared
} }
} }
}
}; };
cx.layout_of(ty).to_result().ok().map(|layout| PointeeInfo { cx.layout_of(ty).to_result().ok().map(|layout| PointeeInfo {

View file

@ -1,4 +1,4 @@
// compile-flags: -C no-prepopulate-passes // compile-flags: -O -C no-prepopulate-passes
// ignore-tidy-linelength // ignore-tidy-linelength
// min-system-llvm-version: 12.0 // min-system-llvm-version: 12.0

View file

@ -1,4 +1,4 @@
// compile-flags: -Z mutable-noalias=yes // compile-flags: -O -Z mutable-noalias=yes
#![crate_type = "lib"] #![crate_type = "lib"]

View file

@ -1,5 +1,5 @@
// ignore-tidy-linelength // ignore-tidy-linelength
// compile-flags: -C no-prepopulate-passes // compile-flags: -O -C no-prepopulate-passes
#![crate_type = "lib"] #![crate_type = "lib"]