Skip to content

Commit 873dcf4

Browse files
VeykrilVeykril
committed
Lazy generics
1 parent 3b97b75 commit 873dcf4

File tree

4 files changed

+26
-11
lines changed

4 files changed

+26
-11
lines changed

‎src/tools/rust-analyzer/crates/hir-ty/src/consteval.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ impl From<MirEvalError> for ConstEvalError {
7171
}
7272
}
7373

74-
pub(crate) fn path_to_const(
74+
pub(crate) fn path_to_const<'g>(
7575
db: &dyn HirDatabase,
7676
resolver: &Resolver,
7777
path: &Path,
7878
mode: ParamLoweringMode,
79-
args: impl FnOnce() -> Option<Generics>,
79+
args: impl FnOnce() -> Option<&'g Generics>,
8080
debruijn: DebruijnIndex,
8181
expected_ty: Ty,
8282
) -> Option<Const> {
@@ -89,7 +89,7 @@ pub(crate) fn path_to_const(
8989
}
9090
ParamLoweringMode::Variable => {
9191
let args = args();
92-
match args.as_ref().and_then(|args| args.type_or_const_param_idx(p.into())) {
92+
match args.and_then(|args| args.type_or_const_param_idx(p.into())) {
9393
Some(it) => ConstValue::BoundVar(BoundVar::new(debruijn, it)),
9494
None => {
9595
never!(

‎src/tools/rust-analyzer/crates/hir-ty/src/infer.rs

+11-2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ use hir_def::{
4949
use hir_expand::name::{name, Name};
5050
use indexmap::IndexSet;
5151
use la_arena::{ArenaMap, Entry};
52+
use once_cell::unsync::OnceCell;
5253
use rustc_hash::{FxHashMap, FxHashSet};
5354
use stdx::{always, never};
5455
use triomphe::Arc;
@@ -527,6 +528,7 @@ pub(crate) struct InferenceContext<'a> {
527528
pub(crate) owner: DefWithBodyId,
528529
pub(crate) body: &'a Body,
529530
pub(crate) resolver: Resolver,
531+
generics: OnceCell<Option<Generics>>,
530532
table: unify::InferenceTable<'a>,
531533
/// The traits in scope, disregarding block modules. This is used for caching purposes.
532534
traits_in_scope: FxHashSet<TraitId>,
@@ -612,6 +614,7 @@ impl<'a> InferenceContext<'a> {
612614
) -> Self {
613615
let trait_env = db.trait_environment_for_body(owner);
614616
InferenceContext {
617+
generics: OnceCell::new(),
615618
result: InferenceResult::default(),
616619
table: unify::InferenceTable::new(db, trait_env),
617620
tuple_field_accesses_rev: Default::default(),
@@ -633,8 +636,14 @@ impl<'a> InferenceContext<'a> {
633636
}
634637
}
635638

636-
pub(crate) fn generics(&self) -> Option<Generics> {
637-
Some(crate::generics::generics(self.db.upcast(), self.resolver.generic_def()?))
639+
pub(crate) fn generics(&self) -> Option<&Generics> {
640+
self.generics
641+
.get_or_init(|| {
642+
self.resolver
643+
.generic_def()
644+
.map(|def| crate::generics::generics(self.db.upcast(), def))
645+
})
646+
.as_ref()
638647
}
639648

640649
// FIXME: This function should be private in module. It is currently only used in the consteval, since we need

‎src/tools/rust-analyzer/crates/hir-ty/src/infer/closure.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ impl CapturedItemWithoutTy {
339339
fn replace_placeholder_with_binder(ctx: &mut InferenceContext<'_>, ty: Ty) -> Binders<Ty> {
340340
struct Filler<'a> {
341341
db: &'a dyn HirDatabase,
342-
generics: Generics,
342+
generics: &'a Generics,
343343
}
344344
impl FallibleTypeFolder<Interner> for Filler<'_> {
345345
type Error = ();
@@ -382,7 +382,7 @@ impl CapturedItemWithoutTy {
382382
};
383383
let filler = &mut Filler { db: ctx.db, generics };
384384
let result = ty.clone().try_fold_with(filler, DebruijnIndex::INNERMOST).unwrap_or(ty);
385-
make_binders(ctx.db, &filler.generics, result)
385+
make_binders(ctx.db, filler.generics, result)
386386
}
387387
}
388388
}

‎src/tools/rust-analyzer/crates/hir-ty/src/lower.rs

+10-4
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ use hir_def::{
4545
use hir_expand::{name::Name, ExpandResult};
4646
use intern::Interned;
4747
use la_arena::{Arena, ArenaMap};
48+
use once_cell::unsync::OnceCell;
4849
use rustc_hash::FxHashSet;
4950
use smallvec::SmallVec;
5051
use stdx::{impl_from, never};
@@ -122,6 +123,7 @@ impl ImplTraitLoweringState {
122123
pub struct TyLoweringContext<'a> {
123124
pub db: &'a dyn HirDatabase,
124125
resolver: &'a Resolver,
126+
generics: OnceCell<Option<Generics>>,
125127
in_binders: DebruijnIndex,
126128
// FIXME: Should not be an `Option` but `Resolver` currently does not return owners in all cases
127129
// where expected
@@ -153,6 +155,7 @@ impl<'a> TyLoweringContext<'a> {
153155
Self {
154156
db,
155157
resolver,
158+
generics: OnceCell::new(),
156159
owner,
157160
in_binders,
158161
impl_trait_mode,
@@ -175,6 +178,7 @@ impl<'a> TyLoweringContext<'a> {
175178
impl_trait_mode,
176179
expander: RefCell::new(expander),
177180
unsized_types: RefCell::new(unsized_types),
181+
generics: self.generics.clone(),
178182
..*self
179183
};
180184
let result = f(&new_ctx);
@@ -246,8 +250,10 @@ impl<'a> TyLoweringContext<'a> {
246250
)
247251
}
248252

249-
fn generics(&self) -> Option<Generics> {
250-
Some(generics(self.db.upcast(), self.resolver.generic_def()?))
253+
fn generics(&self) -> Option<&Generics> {
254+
self.generics
255+
.get_or_init(|| self.resolver.generic_def().map(|def| generics(self.db.upcast(), def)))
256+
.as_ref()
251257
}
252258

253259
pub fn lower_ty_ext(&self, type_ref: &TypeRef) -> (Ty, Option<TypeNs>) {
@@ -2207,14 +2213,14 @@ pub(crate) fn generic_arg_to_chalk<'a, T>(
22072213
}
22082214
}
22092215

2210-
pub(crate) fn const_or_path_to_chalk(
2216+
pub(crate) fn const_or_path_to_chalk<'g>(
22112217
db: &dyn HirDatabase,
22122218
resolver: &Resolver,
22132219
owner: TypeOwnerId,
22142220
expected_ty: Ty,
22152221
value: &ConstRef,
22162222
mode: ParamLoweringMode,
2217-
args: impl FnOnce() -> Option<Generics>,
2223+
args: impl FnOnce() -> Option<&'g Generics>,
22182224
debruijn: DebruijnIndex,
22192225
) -> Const {
22202226
match value {

0 commit comments

Comments
 (0)