bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

const fn stability checking: also check declared language features

Browse source
This commit is contained in:
Ralf Jung 2024-08-27 17:07:02 +02:00
parent bf662eb808
commit c2984179d9
3 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_const_eval/src/check_consts/check.rs
View file

@ -868,9 +868,7 @@ impl<'tcx> Visitor<'tcx> for Checker<'_, 'tcx> {
// Calling an unstable function *always* requires that the corresponding gate
// (or implied gate) be enabled, even if the function has
// `#[rustc_allow_const_fn_unstable(the_gate)]`.
let gate_declared = |gate| {
tcx.features().declared_lib_features.iter().any(|&(sym, _)| sym == gate)
};
let gate_declared = |gate| tcx.features().declared(gate);
let feature_gate_declared = gate_declared(gate);
let implied_gate_declared = implied_by.is_some_and(gate_declared);
if !feature_gate_declared && !implied_gate_declared {

5
compiler/rustc_middle/src/ty/context.rs
View file

@ -3089,10 +3089,7 @@ impl<'tcx> TyCtxt<'tcx> {
Some(stability) if stability.is_const_unstable() => {
// has a `rustc_const_unstable` attribute, check whether the user enabled the
// corresponding feature gate.
self.features()
.declared_lib_features
.iter()
.any(|&(sym, _)| sym == stability.feature)
self.features().declared(stability.feature)
}
// functions without const stability are either stable user written
// const fn or the user is using feature gates and we thus don't