Skip to content

Only load the feature list once in the entire resolver #158263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oli-obk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Only load the feature list once in the entire resolver #158263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions compiler/rustc_resolve/src/build_reduced_graph.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ impl<'a, 'ra, 'tcx> DefCollector<'a, 'ra, 'tcx> {
root_id,
vis,
vis_span: item.vis.span,
on_unknown_attr: OnUnknownData::from_attrs(self.r.tcx, &item.attrs),
on_unknown_attr: OnUnknownData::from_attrs(self.r, &item.attrs),
});

self.r.indeterminate_imports.push(import);
Expand Down Expand Up @@ -863,7 +863,7 @@ impl<'a, 'ra, 'tcx> DefCollector<'a, 'ra, 'tcx> {
|| ast::attr::contains_name(&item.attrs, sym::no_implicit_prelude),
);
self.parent_scope.module = module.to_module();
if let Some(directive) = OnUnknownData::from_attrs(self.r.tcx, &item.attrs) {
if let Some(directive) = OnUnknownData::from_attrs(self.r, &item.attrs) {
self.r.on_unknown_data.insert(local_def_id, directive);
}
}
Expand Down Expand Up @@ -1040,7 +1040,7 @@ impl<'a, 'ra, 'tcx> DefCollector<'a, 'ra, 'tcx> {
module_path: Vec::new(),
vis,
vis_span: item.vis.span,
on_unknown_attr: OnUnknownData::from_attrs(self.r.tcx, &item.attrs),
on_unknown_attr: OnUnknownData::from_attrs(self.r, &item.attrs),
});
if used {
self.r.import_use_map.insert(import, Used::Other);
Expand Down Expand Up @@ -1172,7 +1172,7 @@ impl<'a, 'ra, 'tcx> DefCollector<'a, 'ra, 'tcx> {
module_path: Vec::new(),
vis: Visibility::Restricted(CRATE_DEF_ID),
vis_span: item.vis.span,
on_unknown_attr: OnUnknownData::from_attrs(this.r.tcx, &item.attrs),
on_unknown_attr: OnUnknownData::from_attrs(this.r, &item.attrs),
})
};

Expand Down Expand Up @@ -1353,7 +1353,7 @@ impl<'a, 'ra, 'tcx> DefCollector<'a, 'ra, 'tcx> {
module_path: Vec::new(),
vis,
vis_span: item.vis.span,
on_unknown_attr: OnUnknownData::from_attrs(self.r.tcx, &item.attrs),
on_unknown_attr: OnUnknownData::from_attrs(self.r, &item.attrs),
});
self.r.import_use_map.insert(import, Used::Other);
let import_decl = self.r.new_import_decl(decl, import);
Expand Down
4 changes: 2 additions & 2 deletions compiler/rustc_resolve/src/def_collector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ impl<'a, 'ra, 'tcx> visit::Visitor<'a> for DefCollector<'a, 'ra, 'tcx> {
// Does that prevents errors from happening? maybe
let mut parser = AttributeParser::new(
&self.r.tcx.sess,
self.r.tcx.features(),
self.r.features,
self.r.tcx().registered_tools(()),
ShouldEmit::Nothing,
);
Expand Down Expand Up @@ -433,7 +433,7 @@ impl<'a, 'ra, 'tcx> visit::Visitor<'a> for DefCollector<'a, 'ra, 'tcx> {
// `MgcaDisambiguation::Direct` is set even when MGCA is disabled, so
// to avoid affecting stable we have to feature gate the not creating
// anon consts
if !self.r.tcx.features().min_generic_const_args() {
if !self.r.features.min_generic_const_args() {
let parent = self
.create_def(constant.id, None, DefKind::AnonConst, constant.value.span)
.def_id();
Expand Down
18 changes: 11 additions & 7 deletions compiler/rustc_resolve/src/error_helper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1628,7 +1628,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
in_module.for_each_child(self, |this, ident, orig_ident_span, ns, name_binding| {
// Avoid non-importable candidates.
if name_binding.is_assoc_item()
&& !this.tcx.features().import_trait_associated_functions()
&& !this.features.import_trait_associated_functions()
{
return;
}
Expand Down Expand Up @@ -1809,10 +1809,10 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
}) => {
if span.allows_unstable(feature) {
true
} else if self.tcx.features().enabled(feature) {
} else if self.features.enabled(feature) {
true
} else if let Some(implied_by) = implied_by
&& self.tcx.features().enabled(implied_by)
&& self.features.enabled(implied_by)
{
true
} else {
Expand Down Expand Up @@ -4144,13 +4144,17 @@ pub(crate) struct OnUnknownData {
}

impl OnUnknownData {
pub(crate) fn from_attrs<'tcx>(
tcx: TyCtxt<'tcx>,
pub(crate) fn from_attrs(
r: &Resolver<'_, '_>,
attrs: &[ast::Attribute],
) -> Option<OnUnknownData> {
if tcx.features().diagnostic_on_unknown()
if r.features.diagnostic_on_unknown()
&& let Some(Attribute::Parsed(AttributeKind::OnUnknown { directive, .. })) =
AttributeParser::parse_limited(tcx.sess, attrs, &[sym::diagnostic, sym::on_unknown])
AttributeParser::parse_limited(
r.tcx.sess,
attrs,
&[sym::diagnostic, sym::on_unknown],
)
{
Some(Self { directive: directive? })
} else {
Expand Down
14 changes: 7 additions & 7 deletions compiler/rustc_resolve/src/ident.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
Scope::BuiltinTypes => match self.builtin_type_decls.get(&ident.name) {
Some(decl) => {
if matches!(ident.name, sym::f16)
&& !self.tcx.features().f16()
&& !self.features.f16()
&& !orig_ident_span.allows_unstable(sym::f16)
&& finalize.is_some()
{
Expand All @@ -759,7 +759,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
.emit();
}
if matches!(ident.name, sym::f128)
&& !self.tcx.features().f128()
&& !self.features.f128()
&& !orig_ident_span.allows_unstable(sym::f128)
&& finalize.is_some()
{
Expand Down Expand Up @@ -1535,7 +1535,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
}

RibKind::ConstParamTy => {
if !self.tcx.features().generic_const_parameter_types() {
if !self.features.generic_const_parameter_types() {
if let Some(span) = finalize {
self.report_error(
span,
Expand Down Expand Up @@ -1564,7 +1564,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
}
NoConstantGenericsReason::NonTrivialConstArg => {
ResolutionError::ParamInNonTrivialAnonConst {
is_gca: self.tcx.features().generic_const_args(),
is_gca: self.features.generic_const_args(),
name: rib_ident.name,
param_kind: ParamKindInNonTrivialAnonConst::Type,
}
Expand Down Expand Up @@ -1629,7 +1629,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
| RibKind::ForwardGenericParamBan(_) => continue,

RibKind::ConstParamTy => {
if !self.tcx.features().generic_const_parameter_types() {
if !self.features.generic_const_parameter_types() {
if let Some(span) = finalize {
self.report_error(
span,
Expand All @@ -1656,7 +1656,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
}
NoConstantGenericsReason::NonTrivialConstArg => {
ResolutionError::ParamInNonTrivialAnonConst {
is_gca: self.tcx.features().generic_const_args(),
is_gca: self.features.generic_const_args(),
name: rib_ident.name,
param_kind: ParamKindInNonTrivialAnonConst::Const {
name: rib_ident.name,
Expand Down Expand Up @@ -2019,7 +2019,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
module,
|| {
let import_inherent_item_error_flag =
self.tcx.features().import_trait_associated_functions()
self.features.import_trait_associated_functions()
&& matches!(
res,
Res::Def(
Expand Down
7 changes: 3 additions & 4 deletions compiler/rustc_resolve/src/imports.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
match import_decls[ns] {
PendingDecl::Ready(Some(import_decl)) => {
if import_decl.is_assoc_item()
&& !this.tcx.features().import_trait_associated_functions()
&& !this.features.import_trait_associated_functions()
{
feature_err(
this.tcx.sess,
Expand Down Expand Up @@ -822,8 +822,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
continue;
};

if module.is_trait() && !self.tcx.features().import_trait_associated_functions()
{
if module.is_trait() && !self.features.import_trait_associated_functions() {
feature_err(
self.tcx.sess,
sym::import_trait_associated_functions,
Expand Down Expand Up @@ -1487,7 +1486,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {

// If importing of trait asscoiated items is enabled, an also find an
// `Enum`, then note that inherent associated items cannot be imported.
let note = if self.tcx.features().import_trait_associated_functions()
let note = if self.features.import_trait_associated_functions()
&& let PathResult::Module(ModuleOrUniformRoot::Module(m)) = path_res
&& let Some(Res::Def(DefKind::Enum, _)) = m.res()
{
Expand Down
23 changes: 11 additions & 12 deletions compiler/rustc_resolve/src/late.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1664,7 +1664,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
};
// We'll ban these with a `ConstParamTy` rib, so just clear these ribs for better
// diagnostics, so we don't mention anything about const param tys having generics at all.
if !self.r.tcx.features().generic_const_parameter_types() {
if !self.r.features.generic_const_parameter_types() {
forward_ty_ban_rib_const_param_ty.bindings.clear();
forward_const_ban_rib_const_param_ty.bindings.clear();
}
Expand Down Expand Up @@ -1701,7 +1701,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {

this.ribs[TypeNS].push(forward_ty_ban_rib_const_param_ty);
this.ribs[ValueNS].push(forward_const_ban_rib_const_param_ty);
if this.r.tcx.features().generic_const_parameter_types() {
if this.r.features.generic_const_parameter_types() {
this.visit_ty(ty)
} else {
this.ribs[TypeNS].push(Rib::new(RibKind::ConstParamTy));
Expand Down Expand Up @@ -1812,8 +1812,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
}

LifetimeRibKind::ImplTrait => {
if self.r.tcx.features().anonymous_lifetime_in_impl_trait()
{
if self.r.features.anonymous_lifetime_in_impl_trait() {
None
} else {
Some(LifetimeUseSet::Many)
Expand Down Expand Up @@ -2991,7 +2990,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
self.with_generic_param_rib(
&generics.params,
RibKind::Item(
if self.r.tcx.features().generic_const_items() {
if self.r.features.generic_const_items() {
HasGenericParams::Yes(generics.span)
} else {
HasGenericParams::No
Expand All @@ -3008,7 +3007,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
LifetimeRibKind::Elided(LifetimeRes::Static),
|this| {
if rhs_kind.is_type_const()
&& !this.r.tcx.features().generic_const_parameter_types()
&& !this.r.features.generic_const_parameter_types()
{
this.with_rib(TypeNS, RibKind::ConstParamTy, |this| {
this.with_rib(ValueNS, RibKind::ConstParamTy, |this| {
Expand Down Expand Up @@ -3255,7 +3254,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
RibKind::Normal => {
// FIXME(non_lifetime_binders): Stop special-casing
// const params to error out here.
if self.r.tcx.features().non_lifetime_binders()
if self.r.features.non_lifetime_binders()
&& matches!(param.kind, GenericParamKind::Type { .. })
{
Res::Def(def_kind, def_id.to_def_id())
Expand Down Expand Up @@ -3409,7 +3408,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
|this| {
this.visit_generics(generics);
if rhs_kind.is_type_const()
&& !this.r.tcx.features().generic_const_parameter_types()
&& !this.r.features.generic_const_parameter_types()
{
this.with_rib(TypeNS, RibKind::ConstParamTy, |this| {
this.with_rib(ValueNS, RibKind::ConstParamTy, |this| {
Expand Down Expand Up @@ -5038,10 +5037,10 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
let tcx = self.r.tcx();

let gate_err_sym_msg = match prim {
PrimTy::Float(FloatTy::F16) if !tcx.features().f16() => {
PrimTy::Float(FloatTy::F16) if !self.r.features.f16() => {
Some((sym::f16, "the type `f16` is unstable"))
}
PrimTy::Float(FloatTy::F128) if !tcx.features().f128() => {
PrimTy::Float(FloatTy::F128) if !self.r.features.f128() => {
Some((sym::f128, "the type `f128` is unstable"))
}
_ => None,
Expand Down Expand Up @@ -5196,8 +5195,8 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
AnonConstKind::FieldDefaultValue => ConstantHasGenerics::Yes,
AnonConstKind::InlineConst => ConstantHasGenerics::Yes,
AnonConstKind::ConstArg(_) => {
if self.r.tcx.features().generic_const_exprs()
|| self.r.tcx.features().min_generic_const_args()
if self.r.features.generic_const_exprs()
|| self.r.features.min_generic_const_args()
|| is_trivial_const_arg
{
ConstantHasGenerics::Yes
Expand Down
9 changes: 4 additions & 5 deletions compiler/rustc_resolve/src/late/diagnostics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1775,8 +1775,7 @@ impl<'ast, 'ra, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
// const generics. Of course, `Struct` and `Enum` may contain ty params, too, but the
// benefits of including them here outweighs the small number of false positives.
Some(Res::Def(DefKind::Struct | DefKind::Enum, _))
if self.r.tcx.features().adt_const_params()
|| self.r.tcx.features().min_adt_const_params() =>
if self.r.features.adt_const_params() || self.r.features.min_adt_const_params() =>
{
Applicability::MaybeIncorrect
}
Expand Down Expand Up @@ -3977,16 +3976,16 @@ impl<'ast, 'ra, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
})
.emit(),
NoConstantGenericsReason::NonTrivialConstArg => {
assert!(!self.r.tcx.features().generic_const_exprs());
assert!(!self.r.features.generic_const_exprs());
self.r
.dcx()
.create_err(diagnostics::ParamInNonTrivialAnonConst {
span: lifetime_ref.ident.span,
name: lifetime_ref.ident.name,
param_kind: diagnostics::ParamKindInNonTrivialAnonConst::Lifetime,
help: self.r.tcx.sess.is_nightly_build(),
is_gca: self.r.tcx.features().generic_const_args(),
help_gca: self.r.tcx.features().generic_const_args(),
is_gca: self.r.features.generic_const_args(),
help_gca: self.r.features.generic_const_args(),
})
.emit()
}
Expand Down
16 changes: 8 additions & 8 deletions compiler/rustc_resolve/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ use rustc_data_structures::sync::{FreezeReadGuard, FreezeWriteGuard};
use rustc_data_structures::unord::{UnordItems, UnordMap, UnordSet};
use rustc_errors::{Applicability, Diag, ErrCode, ErrorGuaranteed, LintBuffer};
use rustc_expand::base::{DeriveResolution, SyntaxExtension, SyntaxExtensionKind};
use rustc_feature::BUILTIN_ATTRIBUTES;
use rustc_feature::{BUILTIN_ATTRIBUTES, Features};
use rustc_hir::attrs::StrippedCfgItem;
use rustc_hir::def::Namespace::{self, *};
use rustc_hir::def::{
Expand Down Expand Up @@ -1550,7 +1550,8 @@ pub struct Resolver<'ra, 'tcx> {
impl_trait_names: FxHashMap<NodeId, Symbol> = default::fx_hash_map(),

/// Stores `#[diagnostic::on_unknown]` attributes placed on module declarations.
on_unknown_data: FxHashMap<LocalDefId, OnUnknownData>,
on_unknown_data: FxHashMap<LocalDefId, OnUnknownData> = default::fx_hash_map(),
features: &'tcx Features,
}

/// This provides memory for the rest of the crate. The `'ra` lifetime that is
Expand Down Expand Up @@ -1808,11 +1809,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
let registered_tools = tcx.registered_tools(());
let edition = tcx.sess.edition();

let mut on_unknown_data = default::fx_hash_map();
if let Some(directive) = OnUnknownData::from_attrs(tcx, attrs) {
on_unknown_data.insert(CRATE_DEF_ID, directive);
}

let mut resolver = Resolver {
tcx,

Expand Down Expand Up @@ -1880,10 +1876,14 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
current_crate_outer_attr_insert_span,
disambiguators: Default::default(),
delegation_infos: Default::default(),
on_unknown_data,
features: tcx.features(),
..
};

if let Some(directive) = OnUnknownData::from_attrs(&resolver, attrs) {
resolver.on_unknown_data.insert(CRATE_DEF_ID, directive);
}

let root_parent_scope = ParentScope::module(graph_root, resolver.arenas);
resolver.invocation_parent_scopes.insert(LocalExpnId::ROOT, root_parent_scope);
resolver.feed_visibility(crate_feed, Visibility::Public);
Expand Down
Loading
Loading