Commit 3ec5042

committed

Avoid computing generic params or a param env for free const items

1 parent 200e3f7 commit 3ec5042Copy full SHA for 3ec5042

File tree

+22

-2

lines changed

+22

-2

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,9 @@ use rustc_errors::ErrorGuaranteed;`
`102`	`102`	`use rustc_hir as hir;`
`103`	`103`	`use rustc_hir::def::DefKind;`
`104`	`104`	`use rustc_middle::middle;`
	`105`	`+use rustc_middle::mir::interpret::GlobalId;`
`105`	`106`	`use rustc_middle::query::Providers;`
`106`		`-use rustc_middle::ty::{Ty, TyCtxt};`
	`107`	`+use rustc_middle::ty::{self,Ty, TyCtxt};`
`107`	`108`	`use rustc_middle::util;`
`108`	`109`	`use rustc_session::parse::feature_err;`
`109`	`110`	`use rustc_span::{symbol::sym, Span};`
`@@ -187,7 +188,12 @@ pub fn check_crate(tcx: TyCtxt<'_>) -> Result<(), ErrorGuaranteed> {`
`187`	`188`	`let def_kind = tcx.def_kind(item_def_id);`
`188`	`189`	`match def_kind {`
`189`	`190`	`DefKind::Static { .. } => tcx.ensure().eval_static_initializer(item_def_id),`
`190`		`- DefKind::Const => tcx.ensure().const_eval_poly(item_def_id.into()),`
	`191`	`+ DefKind::Const if tcx.generics_of(item_def_id).params.is_empty() => {`
	`192`	`+ let instance = ty::Instance::new(item_def_id.into(), ty::GenericArgs::empty());`
	`193`	`+ let cid = GlobalId { instance, promoted: None };`
	`194`	`+ let param_env = ty::ParamEnv::reveal_all();`
	`195`	`+ tcx.ensure().eval_to_const_value_raw(param_env.and(cid));`
	`196`	`+ }`
`191`	`197`	`_ => (),`
`192`	`198`	`}`
`193`	`199`	`});`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,14 @@`
	`1`	`+//! Test that nonsense bounds prevent consts from being evaluated at all.`
	`2`	`+//@ check-pass`
	`3`	`+`
	`4`	`+#![feature(generic_const_items)]`
	`5`	`+#![allow(incomplete_features)]`
	`6`	`+trait Trait {`
	`7`	`+ const ASSOC: u32;`
	`8`	`+}`
	`9`	`+`
	`10`	`+// rustfmt eats the where bound`
	`11`	`+#[rustfmt::skip]`
	`12`	`+const ASSOC: u32 = <&'static ()>::ASSOC where for<'a> &'a (): Trait;`
	`13`	`+`
	`14`	`+fn main() {}`

Comments

(0)