Skip to content

Commit 398e3a3

Browse files
borsbors
committed
Auto merge of #17474 - Veykril:ty-perf-stuff, r=Veykril
internal: Remove some allocations from hir-ty
2 parents 36c3731 + 6195749 commit 398e3a3

File tree

5 files changed

+140
-110
lines changed

5 files changed

+140
-110
lines changed

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

-1
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,6 @@ pub(crate) fn associated_ty_data_query(
604604
// Lower bounds -- we could/should maybe move this to a separate query in `lower`
605605
let type_alias_data = db.type_alias_data(type_alias);
606606
let generic_params = generics(db.upcast(), type_alias.into());
607-
// let bound_vars = generic_params.bound_vars_subst(DebruijnIndex::INNERMOST);
608607
let resolver = hir_def::resolver::HasResolver::resolver(type_alias, db.upcast());
609608
let ctx = crate::TyLoweringContext::new(db, &resolver, type_alias.into())
610609
.with_type_param_mode(crate::lower::ParamLoweringMode::Variable);

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ use crate::{
2121
chalk_db,
2222
consteval::ConstEvalError,
2323
layout::{Layout, LayoutError},
24+
lower::{GenericDefaults, GenericPredicates},
2425
method_resolution::{InherentImpls, TraitImpls, TyFingerprint},
2526
mir::{BorrowckResult, MirBody, MirLowerError},
26-
Binders, CallableDefId, ClosureId, Const, FnDefId, GenericArg, ImplTraitId, ImplTraits,
27-
InferenceResult, Interner, PolyFnSig, QuantifiedWhereClause, Substitution, TraitEnvironment,
28-
TraitRef, Ty, TyDefId, ValueTyDefId,
27+
Binders, CallableDefId, ClosureId, Const, FnDefId, ImplTraitId, ImplTraits, InferenceResult,
28+
Interner, PolyFnSig, QuantifiedWhereClause, Substitution, TraitEnvironment, TraitRef, Ty,
29+
TyDefId, ValueTyDefId,
2930
};
3031
use hir_expand::name::Name;
3132

@@ -147,7 +148,7 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> {
147148
) -> Arc<[Binders<QuantifiedWhereClause>]>;
148149

149150
#[salsa::invoke(crate::lower::generic_predicates_query)]
150-
fn generic_predicates(&self, def: GenericDefId) -> Arc<[Binders<QuantifiedWhereClause>]>;
151+
fn generic_predicates(&self, def: GenericDefId) -> GenericPredicates;
151152

152153
#[salsa::invoke(crate::lower::trait_environment_for_body_query)]
153154
#[salsa::transparent]
@@ -158,7 +159,7 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> {
158159

159160
#[salsa::invoke(crate::lower::generic_defaults_query)]
160161
#[salsa::cycle(crate::lower::generic_defaults_recover)]
161-
fn generic_defaults(&self, def: GenericDefId) -> Arc<[Binders<GenericArg>]>;
162+
fn generic_defaults(&self, def: GenericDefId) -> GenericDefaults;
162163

163164
#[salsa::invoke(InherentImpls::inherent_impls_in_crate_query)]
164165
fn inherent_impls_in_crate(&self, krate: CrateId) -> Arc<InherentImpls>;

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

+5-3
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ use crate::{
6464
traits::FnTrait,
6565
utils::{InTypeConstIdMetadata, UnevaluatedConstEvaluatorFolder},
6666
AliasEq, AliasTy, Binders, ClosureId, Const, DomainGoal, GenericArg, Goal, ImplTraitId,
67-
ImplTraitIdx, InEnvironment, Interner, Lifetime, OpaqueTyId, ProjectionTy, Substitution,
68-
TraitEnvironment, Ty, TyBuilder, TyExt,
67+
ImplTraitIdx, InEnvironment, Interner, Lifetime, OpaqueTyId, ParamLoweringMode, ProjectionTy,
68+
Substitution, TraitEnvironment, Ty, TyBuilder, TyExt,
6969
};
7070

7171
// This lint has a false positive here. See the link below for details.
@@ -791,7 +791,8 @@ impl<'a> InferenceContext<'a> {
791791

792792
fn collect_fn(&mut self, func: FunctionId) {
793793
let data = self.db.function_data(func);
794-
let ctx = crate::lower::TyLoweringContext::new(self.db, &self.resolver, func.into())
794+
let ctx = crate::lower::TyLoweringContext::new(self.db, &self.resolver, self.owner.into())
795+
.with_type_param_mode(ParamLoweringMode::Placeholder)
795796
.with_impl_trait_mode(ImplTraitLoweringMode::Param);
796797
let mut param_tys =
797798
data.params.iter().map(|type_ref| ctx.lower_ty(type_ref)).collect::<Vec<_>>();
@@ -826,6 +827,7 @@ impl<'a> InferenceContext<'a> {
826827
let return_ty = &*data.ret_type;
827828

828829
let ctx = crate::lower::TyLoweringContext::new(self.db, &self.resolver, self.owner.into())
830+
.with_type_param_mode(ParamLoweringMode::Placeholder)
829831
.with_impl_trait_mode(ImplTraitLoweringMode::Opaque);
830832
let return_ty = ctx.lower_ty(return_ty);
831833
let return_ty = self.insert_type_vars(return_ty);

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

+8-18
Original file line numberDiff line numberDiff line change
@@ -330,18 +330,15 @@ pub(crate) fn make_single_type_binders<T: HasInterner<Interner = Interner>>(
330330
)
331331
}
332332

333-
pub(crate) fn make_binders_with_count<T: HasInterner<Interner = Interner>>(
333+
pub(crate) fn make_binders<T: HasInterner<Interner = Interner>>(
334334
db: &dyn HirDatabase,
335-
count: usize,
336335
generics: &Generics,
337336
value: T,
338337
) -> Binders<T> {
339-
let it = generics.iter_id().take(count);
340-
341338
Binders::new(
342339
VariableKinds::from_iter(
343340
Interner,
344-
it.map(|x| match x {
341+
generics.iter_id().map(|x| match x {
345342
hir_def::GenericParamId::ConstParamId(id) => {
346343
chalk_ir::VariableKind::Const(db.const_param_ty(id))
347344
}
@@ -355,14 +352,6 @@ pub(crate) fn make_binders_with_count<T: HasInterner<Interner = Interner>>(
355352
)
356353
}
357354

358-
pub(crate) fn make_binders<T: HasInterner<Interner = Interner>>(
359-
db: &dyn HirDatabase,
360-
generics: &Generics,
361-
value: T,
362-
) -> Binders<T> {
363-
make_binders_with_count(db, usize::MAX, generics, value)
364-
}
365-
366355
// FIXME: get rid of this, just replace it by FnPointer
367356
/// A function signature as seen by type inference: Several parameter types and
368357
/// one return type.
@@ -524,14 +513,16 @@ pub type PolyFnSig = Binders<CallableSig>;
524513

525514
impl CallableSig {
526515
pub fn from_params_and_return(
527-
mut params: Vec<Ty>,
516+
params: impl ExactSizeIterator<Item = Ty>,
528517
ret: Ty,
529518
is_varargs: bool,
530519
safety: Safety,
531520
abi: FnAbi,
532521
) -> CallableSig {
533-
params.push(ret);
534-
CallableSig { params_and_return: params.into(), is_varargs, safety, abi }
522+
let mut params_and_return = Vec::with_capacity(params.len() + 1);
523+
params_and_return.extend(params);
524+
params_and_return.push(ret);
525+
CallableSig { params_and_return: params_and_return.into(), is_varargs, safety, abi }
535526
}
536527

537528
pub fn from_def(db: &dyn HirDatabase, def: FnDefId, substs: &Substitution) -> CallableSig {
@@ -946,8 +937,7 @@ pub fn callable_sig_from_fn_trait(
946937
.as_tuple()?
947938
.iter(Interner)
948939
.map(|it| it.assert_ty_ref(Interner))
949-
.cloned()
950-
.collect();
940+
.cloned();
951941

952942
return Some((
953943
fn_x,

0 commit comments

Comments
 (0)