bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #104063 - compiler-errors:ct-norm-unless, r=jackh726

Browse source 
Don't normalize constants unless they need normalization

Maybe makes normalization a bit faster when we have many constants in a type

r? `@ghost`
This commit is contained in:
bors 2022-11-08 10:02:11 +00:00
commit ddfe1e87f7
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_trait_selection/src/traits/project.rs
View file

@ -647,7 +647,7 @@ impl<'a, 'b, 'tcx> TypeFolder<'tcx> for AssocTypeNormalizer<'a, 'b, 'tcx> {
#[instrument(skip(self), level = "debug")] #[instrument(skip(self), level = "debug")]
fn fold_const(&mut self, constant: ty::Const<'tcx>) -> ty::Const<'tcx> { fn fold_const(&mut self, constant: ty::Const<'tcx>) -> ty::Const<'tcx> {
let tcx = self.selcx.tcx(); let tcx = self.selcx.tcx();
if tcx.lazy_normalization() { if tcx.lazy_normalization() || !needs_normalization(&constant, self.param_env.reveal()) {
constant constant
} else { } else {
let constant = constant.super_fold_with(self); let constant = constant.super_fold_with(self);

4
compiler/rustc_trait_selection/src/traits/query/normalize.rs
View file

@ -353,6 +353,10 @@ impl<'cx, 'tcx> FallibleTypeFolder<'tcx> for QueryNormalizer<'cx, 'tcx> {
&mut self, &mut self,
constant: ty::Const<'tcx>, constant: ty::Const<'tcx>,
) -> Result<ty::Const<'tcx>, Self::Error> { ) -> Result<ty::Const<'tcx>, Self::Error> {
if !needs_normalization(&constant, self.param_env.reveal()) {
return Ok(constant);
}
let constant = constant.try_super_fold_with(self)?; let constant = constant.try_super_fold_with(self)?;
debug!(?constant, ?self.param_env); debug!(?constant, ?self.param_env);
Ok(crate::traits::project::with_replaced_escaping_bound_vars( Ok(crate::traits::project::with_replaced_escaping_bound_vars(