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

Don't call with_reveal_all_normalized in evaluate when param-env has inference vars in it

Browse Source
This commit is contained in:
Michael Goulet 2023-02-01 01:12:57 +00:00
parent bbf33836b9
commit 789e8283dd
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/rustc_middle/src/ty/consts/kind.rs
View File

@ -217,23 +217,21 @@ fn try_eval_inner(
// Note that we erase regions *before* calling `with_reveal_all_normalized`, // Note that we erase regions *before* calling `with_reveal_all_normalized`,
// so that we don't try to invoke this query with // so that we don't try to invoke this query with
// any region variables. // any region variables.
let param_env_and = tcx
.erase_regions(param_env)
.with_reveal_all_normalized(tcx)
.and(tcx.erase_regions(unevaluated));
// HACK(eddyb) when the query key would contain inference variables, // HACK(eddyb) when the query key would contain inference variables,
// attempt using identity substs and `ParamEnv` instead, that will succeed // attempt using identity substs and `ParamEnv` instead, that will succeed
// when the expression doesn't depend on any parameters. // when the expression doesn't depend on any parameters.
// FIXME(eddyb, skinny121) pass `InferCtxt` into here when it's available, so that // FIXME(eddyb, skinny121) pass `InferCtxt` into here when it's available, so that
// we can call `infcx.const_eval_resolve` which handles inference variables. // we can call `infcx.const_eval_resolve` which handles inference variables.
let param_env_and = if param_env_and.needs_infer() { let param_env_and = if (param_env, unevaluated).has_non_region_infer() {
tcx.param_env(unevaluated.def.did).and(ty::UnevaluatedConst { tcx.param_env(unevaluated.def.did).and(ty::UnevaluatedConst {
def: unevaluated.def, def: unevaluated.def,
substs: InternalSubsts::identity_for_item(tcx, unevaluated.def.did), substs: InternalSubsts::identity_for_item(tcx, unevaluated.def.did),
}) })
} else { } else {
param_env_and tcx.erase_regions(param_env)
.with_reveal_all_normalized(tcx)
.and(tcx.erase_regions(unevaluated))
}; };
// FIXME(eddyb) maybe the `const_eval_*` methods should take // FIXME(eddyb) maybe the `const_eval_*` methods should take