squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Fix allow_internal_unstable with rustc_const_unstable

Browse source
This commit is contained in:
Gary Guo 2020-06-26 21:05:39 +01:00
parent 50fc24d8a1
commit 224bc05256
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/librustc_mir/transform/check_consts/validation.rs
View file

@ -548,9 +548,12 @@ impl Visitor<'tcx> for Validator<'mir, 'tcx> {
if is_lang_panic_fn(self.tcx, def_id) {
self.check_op(ops::Panic);
} else if let Some(feature) = is_unstable_const_fn(self.tcx, def_id) {
// Exempt unstable const fns inside of macros with
// Exempt unstable const fns inside of macros or functions with
// `#[allow_internal_unstable]`.
if !self.span.allows_unstable(feature) {
use crate::transform::qualify_min_const_fn::feature_allowed;
if !self.span.allows_unstable(feature)
&& !feature_allowed(self.tcx, self.def_id, feature)
{
self.check_op(ops::FnCallUnstable(def_id, feature));
}
} else {

18
src/librustc_mir/transform/qualify_min_const_fn.rs
View file

@ -315,7 +315,7 @@ fn check_place(
}
/// Returns `true` if the given feature gate is allowed within the function with the given `DefId`.
fn feature_allowed(tcx: TyCtxt<'tcx>, def_id: DefId, feature_gate: Symbol) -> bool {
pub fn feature_allowed(tcx: TyCtxt<'tcx>, def_id: DefId, feature_gate: Symbol) -> bool {
// All features require that the corresponding gate be enabled,
// even if the function has `#[allow_internal_unstable(the_gate)]`.
if !tcx.features().enabled(feature_gate) {
@ -377,8 +377,16 @@ fn check_terminator(
fn_span: _,
} => {
let fn_ty = func.ty(body, tcx);
if let ty::FnDef(def_id, _) = fn_ty.kind {
if !crate::const_eval::is_min_const_fn(tcx, def_id) {
if let ty::FnDef(fn_def_id, _) = fn_ty.kind {
// Allow unstable const if we opt in by using #[allow_internal_unstable]
// on function or macro declaration.
if !crate::const_eval::is_min_const_fn(tcx, fn_def_id)
&& !crate::const_eval::is_unstable_const_fn(tcx, fn_def_id)
.map(|feature| {
span.allows_unstable(feature) || feature_allowed(tcx, def_id, feature)
})
.unwrap_or(false)
{
return Err((
span,
format!(
@ -390,10 +398,10 @@ fn check_terminator(
));
}
check_operand(tcx, func, span, def_id, body)?;
check_operand(tcx, func, span, fn_def_id, body)?;
for arg in args {
check_operand(tcx, arg, span, def_id, body)?;
check_operand(tcx, arg, span, fn_def_id, body)?;
}
Ok(())
} else {