Skip to content

Commit

Permalink
Rollup merge of #88080 - fee1-dead:iterator-const, r=oli-obk
Browse files Browse the repository at this point in the history
Skip assert ICE with default_method_body_is_const

functions marked with #[default_method_body_is_const] would
ICE when being const checked due to it not being a const function:
`tcx.is_const_fn_raw(did)` returns false. We should skip this assert
when it is marked with that attribute.

r? `@oli-obk`
  • Loading branch information
m-ou-se authored Aug 16, 2021
2 parents 18a7b6d + 85abdf0 commit 4de53c4
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
9 changes: 8 additions & 1 deletion compiler/rustc_mir/src/transform/check_consts/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use rustc_hir as hir;
use rustc_hir::def_id::{DefId, LocalDefId};
use rustc_middle::mir;
use rustc_middle::ty::{self, TyCtxt};
use rustc_span::Symbol;
use rustc_span::{sym, Symbol};

pub use self::qualifs::Qualif;

Expand Down Expand Up @@ -104,6 +104,13 @@ pub fn rustc_allow_const_fn_unstable(
pub fn is_const_stable_const_fn(tcx: TyCtxt<'tcx>, def_id: DefId) -> bool {
use attr::{ConstStability, Stability, StabilityLevel};

// A default body marked const is not const-stable because const
// trait fns currently cannot be const-stable. We shouldn't
// restrict default bodies to only call const-stable functions.
if tcx.has_attr(def_id, sym::default_method_body_is_const) {
return false;
}

// Const-stability is only relevant for `const fn`.
assert!(tcx.is_const_fn_raw(def_id));

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// check-pass

// This was an ICE, because the compiler ensures the
// function to be const when performing const checking,
// but functions marked with the attribute are not const
// *and* subject to const checking.

#![feature(staged_api)]
#![feature(const_trait_impl)]
#![feature(const_fn_trait_bound)]
#![stable(since = "1", feature = "foo")]

trait Tr {
#[default_method_body_is_const]
fn a() {}
}

fn main() {}

0 comments on commit 4de53c4

Please sign in to comment.