Rollup merge of #74538 - nbdd0121:issue-73976, r=lcnr
Guard against non-monomorphized type_id intrinsic call This PR checks whether the type is sufficient monomorphized when calling type_id or type_name intrinsics. If the type is not sufficiently monomorphized, e.g. used in a pattern, the code will be rejected. Fixes #73976
This commit is contained in:
commit
4828895cd9
@ -12,7 +12,7 @@ use rustc_middle::mir::{
|
||||
};
|
||||
use rustc_middle::ty;
|
||||
use rustc_middle::ty::subst::SubstsRef;
|
||||
use rustc_middle::ty::{Ty, TyCtxt};
|
||||
use rustc_middle::ty::{Ty, TyCtxt, TypeFoldable};
|
||||
use rustc_span::symbol::{sym, Symbol};
|
||||
use rustc_target::abi::{Abi, LayoutOf as _, Primitive, Size};
|
||||
|
||||
@ -54,6 +54,9 @@ crate fn eval_nullary_intrinsic<'tcx>(
|
||||
let name = tcx.item_name(def_id);
|
||||
Ok(match name {
|
||||
sym::type_name => {
|
||||
if tp_ty.needs_subst() {
|
||||
throw_inval!(TooGeneric);
|
||||
}
|
||||
let alloc = type_name::alloc_type_name(tcx, tp_ty);
|
||||
ConstValue::Slice { data: alloc, start: 0, end: alloc.len() }
|
||||
}
|
||||
@ -68,7 +71,12 @@ crate fn eval_nullary_intrinsic<'tcx>(
|
||||
};
|
||||
ConstValue::from_machine_usize(n, &tcx)
|
||||
}
|
||||
sym::type_id => ConstValue::from_u64(tcx.type_id_hash(tp_ty)),
|
||||
sym::type_id => {
|
||||
if tp_ty.needs_subst() {
|
||||
throw_inval!(TooGeneric);
|
||||
}
|
||||
ConstValue::from_u64(tcx.type_id_hash(tp_ty))
|
||||
}
|
||||
sym::variant_count => {
|
||||
if let ty::Adt(ref adt, _) = tp_ty.kind {
|
||||
ConstValue::from_machine_usize(adt.variants.len() as u64, &tcx)
|
||||
|
36
src/test/ui/consts/issue-73976-monomorphic.rs
Normal file
36
src/test/ui/consts/issue-73976-monomorphic.rs
Normal file
@ -0,0 +1,36 @@
|
||||
// check-pass
|
||||
//
|
||||
// This test is complement to the test in issue-73976-polymorphic.rs.
|
||||
// In that test we ensure that polymorphic use of type_id and type_name in patterns
|
||||
// will be properly rejected. This test will ensure that monomorphic use of these
|
||||
// would not be wrongly rejected in patterns.
|
||||
|
||||
#![feature(const_type_id)]
|
||||
#![feature(const_type_name)]
|
||||
|
||||
use std::any::{self, TypeId};
|
||||
|
||||
pub struct GetTypeId<T>(T);
|
||||
|
||||
impl<T: 'static> GetTypeId<T> {
|
||||
pub const VALUE: TypeId = TypeId::of::<T>();
|
||||
}
|
||||
|
||||
const fn check_type_id<T: 'static>() -> bool {
|
||||
matches!(GetTypeId::<T>::VALUE, GetTypeId::<usize>::VALUE)
|
||||
}
|
||||
|
||||
pub struct GetTypeNameLen<T>(T);
|
||||
|
||||
impl<T: 'static> GetTypeNameLen<T> {
|
||||
pub const VALUE: usize = any::type_name::<T>().len();
|
||||
}
|
||||
|
||||
const fn check_type_name_len<T: 'static>() -> bool {
|
||||
matches!(GetTypeNameLen::<T>::VALUE, GetTypeNameLen::<usize>::VALUE)
|
||||
}
|
||||
|
||||
fn main() {
|
||||
assert!(check_type_id::<usize>());
|
||||
assert!(check_type_name_len::<usize>());
|
||||
}
|
40
src/test/ui/consts/issue-73976-polymorphic.rs
Normal file
40
src/test/ui/consts/issue-73976-polymorphic.rs
Normal file
@ -0,0 +1,40 @@
|
||||
// This test is from #73976. We previously did not check if a type is monomorphized
|
||||
// before calculating its type id, which leads to the bizzare behaviour below that
|
||||
// TypeId of a generic type does not match itself.
|
||||
//
|
||||
// This test case should either run-pass or be rejected at compile time.
|
||||
// Currently we just disallow this usage and require pattern is monomorphic.
|
||||
|
||||
#![feature(const_type_id)]
|
||||
#![feature(const_type_name)]
|
||||
|
||||
use std::any::{self, TypeId};
|
||||
|
||||
pub struct GetTypeId<T>(T);
|
||||
|
||||
impl<T: 'static> GetTypeId<T> {
|
||||
pub const VALUE: TypeId = TypeId::of::<T>();
|
||||
}
|
||||
|
||||
const fn check_type_id<T: 'static>() -> bool {
|
||||
matches!(GetTypeId::<T>::VALUE, GetTypeId::<T>::VALUE)
|
||||
//~^ ERROR could not evaluate constant pattern
|
||||
//~| ERROR could not evaluate constant pattern
|
||||
}
|
||||
|
||||
pub struct GetTypeNameLen<T>(T);
|
||||
|
||||
impl<T: 'static> GetTypeNameLen<T> {
|
||||
pub const VALUE: usize = any::type_name::<T>().len();
|
||||
}
|
||||
|
||||
const fn check_type_name_len<T: 'static>() -> bool {
|
||||
matches!(GetTypeNameLen::<T>::VALUE, GetTypeNameLen::<T>::VALUE)
|
||||
//~^ ERROR could not evaluate constant pattern
|
||||
//~| ERROR could not evaluate constant pattern
|
||||
}
|
||||
|
||||
fn main() {
|
||||
assert!(check_type_id::<usize>());
|
||||
assert!(check_type_name_len::<usize>());
|
||||
}
|
26
src/test/ui/consts/issue-73976-polymorphic.stderr
Normal file
26
src/test/ui/consts/issue-73976-polymorphic.stderr
Normal file
@ -0,0 +1,26 @@
|
||||
error: could not evaluate constant pattern
|
||||
--> $DIR/issue-73976-polymorphic.rs:20:37
|
||||
|
|
||||
LL | matches!(GetTypeId::<T>::VALUE, GetTypeId::<T>::VALUE)
|
||||
| ^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
error: could not evaluate constant pattern
|
||||
--> $DIR/issue-73976-polymorphic.rs:32:42
|
||||
|
|
||||
LL | matches!(GetTypeNameLen::<T>::VALUE, GetTypeNameLen::<T>::VALUE)
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
error: could not evaluate constant pattern
|
||||
--> $DIR/issue-73976-polymorphic.rs:20:37
|
||||
|
|
||||
LL | matches!(GetTypeId::<T>::VALUE, GetTypeId::<T>::VALUE)
|
||||
| ^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
error: could not evaluate constant pattern
|
||||
--> $DIR/issue-73976-polymorphic.rs:32:42
|
||||
|
|
||||
LL | matches!(GetTypeNameLen::<T>::VALUE, GetTypeNameLen::<T>::VALUE)
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
error: aborting due to 4 previous errors
|
||||
|
Loading…
Reference in New Issue
Block a user