mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

get rid of normalize_generic_arg... queries

Browse Source
This commit is contained in:
b-naber 2021-12-10 17:31:40 +01:00
parent 8250eef685
commit 399ab40dbd
3 changed files with 9 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
compiler/rustc_middle/src/query/mod.rs
View File

@ -1658,27 +1658,6 @@
remap_env_constness remap_env_constness
} }
// FIXME: Implement `normalize_generic_arg_after_erasing_regions` and
// `normalize_mir_const_after_erasing_regions` in terms of
// `try_normalize_generic_arg_after_erasing_regions` and
// `try_normalize_mir_const_after_erasing_regions`, respectively.
/// Do not call this query directly: invoke `normalize_erasing_regions` instead.
query normalize_generic_arg_after_erasing_regions(
goal: ParamEnvAnd<'tcx, GenericArg<'tcx>>
) -> GenericArg<'tcx> {
desc { "normalizing `{}`", goal.value }
remap_env_constness
}
/// Do not call this query directly: invoke `normalize_erasing_regions` instead.
query normalize_mir_const_after_erasing_regions(
goal: ParamEnvAnd<'tcx, mir::ConstantKind<'tcx>>
) -> mir::ConstantKind<'tcx> {
desc { "normalizing `{}`", goal.value }
remap_env_constness
}
/// Do not call this query directly: invoke `try_normalize_erasing_regions` instead. /// Do not call this query directly: invoke `try_normalize_erasing_regions` instead.
query try_normalize_generic_arg_after_erasing_regions( query try_normalize_generic_arg_after_erasing_regions(
goal: ParamEnvAnd<'tcx, GenericArg<'tcx>> goal: ParamEnvAnd<'tcx, GenericArg<'tcx>>

9
compiler/rustc_middle/src/ty/normalize_erasing_regions.rs
View File

@ -176,7 +176,10 @@ fn normalize_generic_arg_after_erasing_regions(
let arg = self.param_env.and(arg); let arg = self.param_env.and(arg);
debug!(?arg); debug!(?arg);
self.tcx.normalize_generic_arg_after_erasing_regions(arg) self.tcx.try_normalize_generic_arg_after_erasing_regions(arg).unwrap_or_else(|_| bug!(
"Failed to normalize {:?}, maybe try to call `try_normalize_erasing_regions` instead",
arg.value
))
} }
} }
@ -197,7 +200,9 @@ fn fold_const(&mut self, c: &'tcx ty::Const<'tcx>) -> &'tcx ty::Const<'tcx> {
fn fold_mir_const(&mut self, c: mir::ConstantKind<'tcx>) -> mir::ConstantKind<'tcx> { fn fold_mir_const(&mut self, c: mir::ConstantKind<'tcx>) -> mir::ConstantKind<'tcx> {
// FIXME: This *probably* needs canonicalization too! // FIXME: This *probably* needs canonicalization too!
let arg = self.param_env.and(c); let arg = self.param_env.and(c);
self.tcx.normalize_mir_const_after_erasing_regions(arg) self.tcx
.try_normalize_mir_const_after_erasing_regions(arg)
.unwrap_or_else(|_| bug!("failed to normalize {:?}", c))
} }
} }

20
compiler/rustc_traits/src/normalize_erasing_regions.rs
View File

@ -8,30 +8,14 @@
crate fn provide(p: &mut Providers) { crate fn provide(p: &mut Providers) {
*p = Providers { *p = Providers {
normalize_generic_arg_after_erasing_regions: |tcx, goal| { try_normalize_generic_arg_after_erasing_regions: |tcx, goal| {
debug!("normalize_generic_arg_after_erasing_regions(goal={:#?})", goal); debug!("try_normalize_generic_arg_after_erasing_regions(goal={:#?}", goal);
tcx.sess tcx.sess
.perf_stats .perf_stats
.normalize_generic_arg_after_erasing_regions .normalize_generic_arg_after_erasing_regions
.fetch_add(1, Ordering::Relaxed); .fetch_add(1, Ordering::Relaxed);
let (param_env, goal) = goal.into_parts();
tcx.try_normalize_erasing_regions(param_env, goal).unwrap_or_else(|_| bug!(
"Failed to normalize {:?}, maybe try to call `try_normalize_erasing_regions` instead",
goal
))
},
normalize_mir_const_after_erasing_regions: |tcx, goal| {
let (param_env, goal) = goal.into_parts();
tcx.try_normalize_erasing_regions(param_env, goal).unwrap_or_else(|_| bug!(
"Failed to normalize {:?}, maybe try to call `try_normalize_erasing_regions` instead",
goal
))
},
try_normalize_generic_arg_after_erasing_regions: |tcx, goal| {
debug!("try_normalize_generic_arg_after_erasing_regions(goal={:#?}", goal);
try_normalize_after_erasing_regions(tcx, goal) try_normalize_after_erasing_regions(tcx, goal)
}, },
try_normalize_mir_const_after_erasing_regions: |tcx, goal| { try_normalize_mir_const_after_erasing_regions: |tcx, goal| {