mirror of
https://github.com/rust-lang/rust.git
synced 2025-04-16 05:56:56 +00:00
GCI: Don't try to collect mono items inside overly generic free const items
This commit is contained in:
parent
01a26c026d
commit
0a9ee02d0a
@ -1454,11 +1454,14 @@ impl<'v> RootCollector<'_, 'v> {
|
||||
self.output.push(dummy_spanned(MonoItem::Static(def_id)));
|
||||
}
|
||||
DefKind::Const => {
|
||||
// const items only generate mono items if they are
|
||||
// actually used somewhere. Just declaring them is insufficient.
|
||||
// Const items only generate mono items if they are actually used somewhere.
|
||||
// Just declaring them is insufficient.
|
||||
|
||||
// but even just declaring them must collect the items they refer to
|
||||
if let Ok(val) = self.tcx.const_eval_poly(id.owner_id.to_def_id()) {
|
||||
// But even just declaring them must collect the items they refer to
|
||||
// unless their generics require monomorphization.
|
||||
if !self.tcx.generics_of(id.owner_id).requires_monomorphization(self.tcx)
|
||||
&& let Ok(val) = self.tcx.const_eval_poly(id.owner_id.to_def_id())
|
||||
{
|
||||
collect_const_value(self.tcx, val, self.output);
|
||||
}
|
||||
}
|
||||
|
11
tests/ui/generic-const-items/def-site-eval.fail.stderr
Normal file
11
tests/ui/generic-const-items/def-site-eval.fail.stderr
Normal file
@ -0,0 +1,11 @@
|
||||
error[E0080]: evaluation of `_::<'_>` failed
|
||||
--> $DIR/def-site-eval.rs:14:20
|
||||
|
|
||||
LL | const _<'_a>: () = panic!();
|
||||
| ^^^^^^^^ the evaluated program panicked at 'explicit panic', $DIR/def-site-eval.rs:14:20
|
||||
|
|
||||
= note: this error originates in the macro `$crate::panic::panic_2015` which comes from the expansion of the macro `panic` (in Nightly builds, run with -Z macro-backtrace for more info)
|
||||
|
||||
error: aborting due to 1 previous error
|
||||
|
||||
For more information about this error, try `rustc --explain E0080`.
|
16
tests/ui/generic-const-items/def-site-eval.rs
Normal file
16
tests/ui/generic-const-items/def-site-eval.rs
Normal file
@ -0,0 +1,16 @@
|
||||
//! Test that we only evaluate free const items (their def site to be clear)
|
||||
//! whose generics don't require monomorphization.
|
||||
#![feature(generic_const_items)]
|
||||
#![allow(incomplete_features)]
|
||||
|
||||
//@ revisions: fail pass
|
||||
//@[fail] build-fail (we require monomorphization)
|
||||
//@[pass] build-pass (we require monomorphization)
|
||||
|
||||
const _<_T>: () = panic!();
|
||||
const _<const _N: usize>: () = panic!();
|
||||
|
||||
#[cfg(fail)]
|
||||
const _<'_a>: () = panic!(); //[fail]~ ERROR evaluation of `_::<'_>` failed
|
||||
|
||||
fn main() {}
|
13
tests/ui/generic-const-items/def-site-mono.rs
Normal file
13
tests/ui/generic-const-items/def-site-mono.rs
Normal file
@ -0,0 +1,13 @@
|
||||
//! Ensure that we don't try to collect monomorphizeable items inside free const
|
||||
//! items (their def site to be clear) whose generics require monomorphization.
|
||||
//!
|
||||
//! Such items are to be collected at instantiation sites of free consts.
|
||||
|
||||
#![feature(generic_const_items)]
|
||||
#![allow(incomplete_features)]
|
||||
|
||||
//@ build-pass (we require monomorphization)
|
||||
|
||||
const _IDENTITY<T>: fn(T) -> T = |x| x;
|
||||
|
||||
fn main() {}
|
Loading…
Reference in New Issue
Block a user