Guard against non-monomorphized type_id intrinsic call
This commit is contained in:
parent
d7f9451634
commit
4fb260bb32
@ -12,7 +12,7 @@
|
|||||||
};
|
};
|
||||||
use rustc_middle::ty;
|
use rustc_middle::ty;
|
||||||
use rustc_middle::ty::subst::SubstsRef;
|
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_span::symbol::{sym, Symbol};
|
||||||
use rustc_target::abi::{Abi, LayoutOf as _, Primitive, Size};
|
use rustc_target::abi::{Abi, LayoutOf as _, Primitive, Size};
|
||||||
|
|
||||||
@ -54,6 +54,9 @@ fn numeric_intrinsic<'tcx, Tag>(
|
|||||||
let name = tcx.item_name(def_id);
|
let name = tcx.item_name(def_id);
|
||||||
Ok(match name {
|
Ok(match name {
|
||||||
sym::type_name => {
|
sym::type_name => {
|
||||||
|
if tp_ty.needs_subst() {
|
||||||
|
throw_inval!(TooGeneric);
|
||||||
|
}
|
||||||
let alloc = type_name::alloc_type_name(tcx, tp_ty);
|
let alloc = type_name::alloc_type_name(tcx, tp_ty);
|
||||||
ConstValue::Slice { data: alloc, start: 0, end: alloc.len() }
|
ConstValue::Slice { data: alloc, start: 0, end: alloc.len() }
|
||||||
}
|
}
|
||||||
@ -68,7 +71,12 @@ fn numeric_intrinsic<'tcx, Tag>(
|
|||||||
};
|
};
|
||||||
ConstValue::from_machine_usize(n, &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 => {
|
sym::variant_count => {
|
||||||
if let ty::Adt(ref adt, _) = tp_ty.kind {
|
if let ty::Adt(ref adt, _) = tp_ty.kind {
|
||||||
ConstValue::from_machine_usize(adt.variants.len() as u64, &tcx)
|
ConstValue::from_machine_usize(adt.variants.len() as u64, &tcx)
|
||||||
|
26
src/test/ui/consts/issue-73976.rs
Normal file
26
src/test/ui/consts/issue-73976.rs
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
// 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)]
|
||||||
|
|
||||||
|
use std::any::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
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
assert!(check_type_id::<usize>());
|
||||||
|
}
|
14
src/test/ui/consts/issue-73976.stderr
Normal file
14
src/test/ui/consts/issue-73976.stderr
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
error: could not evaluate constant pattern
|
||||||
|
--> $DIR/issue-73976.rs:19:37
|
||||||
|
|
|
||||||
|
LL | matches!(GetTypeId::<T>::VALUE, GetTypeId::<T>::VALUE)
|
||||||
|
| ^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
error: could not evaluate constant pattern
|
||||||
|
--> $DIR/issue-73976.rs:19:37
|
||||||
|
|
|
||||||
|
LL | matches!(GetTypeId::<T>::VALUE, GetTypeId::<T>::VALUE)
|
||||||
|
| ^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
error: aborting due to 2 previous errors
|
||||||
|
|
Loading…
Reference in New Issue
Block a user