Add a cache for rustc_legacy_const_generics
This commit is contained in:
parent
cccd77955b
commit
22184a0f5d
@ -175,7 +175,7 @@ pub trait ResolverAstLowering {
|
|||||||
|
|
||||||
fn item_generics_num_lifetimes(&self, def: DefId, sess: &Session) -> usize;
|
fn item_generics_num_lifetimes(&self, def: DefId, sess: &Session) -> usize;
|
||||||
|
|
||||||
fn legacy_const_generic_args(&self, expr: &Expr) -> Option<Vec<usize>>;
|
fn legacy_const_generic_args(&mut self, expr: &Expr) -> Option<Vec<usize>>;
|
||||||
|
|
||||||
/// Obtains resolution for a `NodeId` with a single resolution.
|
/// Obtains resolution for a `NodeId` with a single resolution.
|
||||||
fn get_partial_res(&mut self, id: NodeId) -> Option<PartialRes>;
|
fn get_partial_res(&mut self, id: NodeId) -> Option<PartialRes>;
|
||||||
|
@ -996,6 +996,8 @@ pub struct Resolver<'a> {
|
|||||||
/// Some way to know that we are in a *trait* impl in `visit_assoc_item`.
|
/// Some way to know that we are in a *trait* impl in `visit_assoc_item`.
|
||||||
/// FIXME: Replace with a more general AST map (together with some other fields).
|
/// FIXME: Replace with a more general AST map (together with some other fields).
|
||||||
trait_impl_items: FxHashSet<LocalDefId>,
|
trait_impl_items: FxHashSet<LocalDefId>,
|
||||||
|
|
||||||
|
legacy_const_generic_args: FxHashMap<DefId, Option<Vec<usize>>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Nothing really interesting here; it just provides memory for the rest of the crate.
|
/// Nothing really interesting here; it just provides memory for the rest of the crate.
|
||||||
@ -1077,7 +1079,7 @@ fn item_generics_num_lifetimes(&self, def_id: DefId, sess: &Session) -> usize {
|
|||||||
self.cstore().item_generics_num_lifetimes(def_id, sess)
|
self.cstore().item_generics_num_lifetimes(def_id, sess)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn legacy_const_generic_args(&self, expr: &Expr) -> Option<Vec<usize>> {
|
fn legacy_const_generic_args(&mut self, expr: &Expr) -> Option<Vec<usize>> {
|
||||||
self.legacy_const_generic_args(expr)
|
self.legacy_const_generic_args(expr)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1321,6 +1323,7 @@ pub fn new(
|
|||||||
invocation_parents,
|
invocation_parents,
|
||||||
next_disambiguator: Default::default(),
|
next_disambiguator: Default::default(),
|
||||||
trait_impl_items: Default::default(),
|
trait_impl_items: Default::default(),
|
||||||
|
legacy_const_generic_args: Default::default(),
|
||||||
};
|
};
|
||||||
|
|
||||||
let root_parent_scope = ParentScope::module(graph_root, &resolver);
|
let root_parent_scope = ParentScope::module(graph_root, &resolver);
|
||||||
@ -3317,7 +3320,7 @@ pub fn opt_span(&self, def_id: DefId) -> Option<Span> {
|
|||||||
/// Checks if an expression refers to a function marked with
|
/// Checks if an expression refers to a function marked with
|
||||||
/// `#[rustc_legacy_const_generics]` and returns the argument index list
|
/// `#[rustc_legacy_const_generics]` and returns the argument index list
|
||||||
/// from the attribute.
|
/// from the attribute.
|
||||||
pub fn legacy_const_generic_args(&self, expr: &Expr) -> Option<Vec<usize>> {
|
pub fn legacy_const_generic_args(&mut self, expr: &Expr) -> Option<Vec<usize>> {
|
||||||
if let ExprKind::Path(None, path) = &expr.kind {
|
if let ExprKind::Path(None, path) = &expr.kind {
|
||||||
// Don't perform legacy const generics rewriting if the path already
|
// Don't perform legacy const generics rewriting if the path already
|
||||||
// has generic arguments.
|
// has generic arguments.
|
||||||
@ -3338,6 +3341,11 @@ pub fn legacy_const_generic_args(&self, expr: &Expr) -> Option<Vec<usize>> {
|
|||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if let Some(v) = self.legacy_const_generic_args.get(&def_id) {
|
||||||
|
return v.clone();
|
||||||
|
}
|
||||||
|
|
||||||
|
let parse_attrs = || {
|
||||||
let attrs = self.cstore().item_attrs(def_id, self.session);
|
let attrs = self.cstore().item_attrs(def_id, self.session);
|
||||||
let attr = attrs
|
let attr = attrs
|
||||||
.iter()
|
.iter()
|
||||||
@ -3351,7 +3359,14 @@ pub fn legacy_const_generic_args(&self, expr: &Expr) -> Option<Vec<usize>> {
|
|||||||
_ => panic!("invalid arg index"),
|
_ => panic!("invalid arg index"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Some(ret);
|
Some(ret)
|
||||||
|
};
|
||||||
|
|
||||||
|
// Cache the lookup to avoid parsing attributes for an iterm
|
||||||
|
// multiple times.
|
||||||
|
let ret = parse_attrs();
|
||||||
|
self.legacy_const_generic_args.insert(def_id, ret.clone());
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
None
|
None
|
||||||
|
Loading…
Reference in New Issue
Block a user