bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

only emit "enable gce" error if it would fix compile error

Browse source
This commit is contained in:
Boxy 2022-11-24 11:25:19 +00:00 • committed by kadmin
parent 2ac5d91d63
commit 677bdcb8a9
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
compiler/rustc_trait_selection/src/traits/const_evaluatable.rs
View file

@ -52,7 +52,7 @@ pub fn is_const_evaluatable<'tcx>(
}; };
if !is_anon_ct { if !is_anon_ct {
if satisfied_from_param_env(tcx, infcx, ct, param_env)? { if satisfied_from_param_env(tcx, infcx, ct, param_env) {
return Ok(()); return Ok(());
} }
if ct.has_non_region_infer() { if ct.has_non_region_infer() {
@ -87,8 +87,14 @@ pub fn is_const_evaluatable<'tcx>(
// If we're evaluating a generic foreign constant, under a nightly compiler while // If we're evaluating a generic foreign constant, under a nightly compiler while
// the current crate does not enable `feature(generic_const_exprs)`, abort // the current crate does not enable `feature(generic_const_exprs)`, abort
// compilation with a useful error. // compilation with a useful error.
Err(_) if tcx.sess.is_nightly_build() Err(_)
&& let ty::ConstKind::Expr(_) = tcx.expand_abstract_consts(ct).kind() => if tcx.sess.is_nightly_build()
&& satisfied_from_param_env(
tcx,
infcx,
tcx.expand_abstract_consts(ct),
param_env,
) =>
{ {
tcx.sess tcx.sess
.struct_span_fatal( .struct_span_fatal(
@ -112,12 +118,15 @@ pub fn is_const_evaluatable<'tcx>(
} else if uv.has_non_region_param() { } else if uv.has_non_region_param() {
NotConstEvaluatable::MentionsParam NotConstEvaluatable::MentionsParam
} else { } else {
let guar = infcx.tcx.sess.delay_span_bug(span, format!("Missing value for constant, but no error reported?")); let guar = infcx.tcx.sess.delay_span_bug(
span,
format!("Missing value for constant, but no error reported?"),
);
NotConstEvaluatable::Error(guar) NotConstEvaluatable::Error(guar)
}; };
Err(err) Err(err)
}, }
Err(ErrorHandled::Reported(e)) => Err(NotConstEvaluatable::Error(e)), Err(ErrorHandled::Reported(e)) => Err(NotConstEvaluatable::Error(e)),
Ok(_) => Ok(()), Ok(_) => Ok(()),
} }
@ -130,7 +139,7 @@ fn satisfied_from_param_env<'tcx>(
infcx: &InferCtxt<'tcx>, infcx: &InferCtxt<'tcx>,
ct: ty::Const<'tcx>, ct: ty::Const<'tcx>,
param_env: ty::ParamEnv<'tcx>, param_env: ty::ParamEnv<'tcx>,
) -> Result<bool, NotConstEvaluatable> { ) -> bool {
// Try to unify with each subtree in the AbstractConst to allow for // Try to unify with each subtree in the AbstractConst to allow for
// `N + 1` being const evaluatable even if theres only a `ConstEvaluatable` // `N + 1` being const evaluatable even if theres only a `ConstEvaluatable`
// predicate for `(N + 1) * 2` // predicate for `(N + 1) * 2`
@ -179,12 +188,12 @@ fn satisfied_from_param_env<'tcx>(
if let ControlFlow::Break(()) = result { if let ControlFlow::Break(()) = result {
debug!("is_const_evaluatable: abstract_const ~~> ok"); debug!("is_const_evaluatable: abstract_const ~~> ok");
return Ok(true); return true;
} }
} }
_ => {} // don't care _ => {} // don't care
} }
} }
Ok(false) false
} }