From 4fb260bb32a2da7d7ea63b759eef77072a95614b Mon Sep 17 00:00:00 2001 From: Gary Guo Date: Sat, 4 Jul 2020 18:41:30 +0100 Subject: [PATCH 1/2] Guard against non-monomorphized type_id intrinsic call --- src/librustc_mir/interpret/intrinsics.rs | 12 +++++++++-- src/test/ui/consts/issue-73976.rs | 26 ++++++++++++++++++++++++ src/test/ui/consts/issue-73976.stderr | 14 +++++++++++++ 3 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 src/test/ui/consts/issue-73976.rs create mode 100644 src/test/ui/consts/issue-73976.stderr diff --git a/src/librustc_mir/interpret/intrinsics.rs b/src/librustc_mir/interpret/intrinsics.rs index 5836fc9c95a80..29549041d258c 100644 --- a/src/librustc_mir/interpret/intrinsics.rs +++ b/src/librustc_mir/interpret/intrinsics.rs @@ -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) diff --git a/src/test/ui/consts/issue-73976.rs b/src/test/ui/consts/issue-73976.rs new file mode 100644 index 0000000000000..ef141791c2cc8 --- /dev/null +++ b/src/test/ui/consts/issue-73976.rs @@ -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); + +impl GetTypeId { + pub const VALUE: TypeId = TypeId::of::(); +} + +const fn check_type_id() -> bool { + matches!(GetTypeId::::VALUE, GetTypeId::::VALUE) + //~^ ERROR could not evaluate constant pattern + //~| ERROR could not evaluate constant pattern +} + +fn main() { + assert!(check_type_id::()); +} diff --git a/src/test/ui/consts/issue-73976.stderr b/src/test/ui/consts/issue-73976.stderr new file mode 100644 index 0000000000000..dbb7690b849c8 --- /dev/null +++ b/src/test/ui/consts/issue-73976.stderr @@ -0,0 +1,14 @@ +error: could not evaluate constant pattern + --> $DIR/issue-73976.rs:19:37 + | +LL | matches!(GetTypeId::::VALUE, GetTypeId::::VALUE) + | ^^^^^^^^^^^^^^^^^^^^^ + +error: could not evaluate constant pattern + --> $DIR/issue-73976.rs:19:37 + | +LL | matches!(GetTypeId::::VALUE, GetTypeId::::VALUE) + | ^^^^^^^^^^^^^^^^^^^^^ + +error: aborting due to 2 previous errors + From b3340b5cea5fdaefa4cbc7eec8ceb0592ebe2255 Mon Sep 17 00:00:00 2001 From: Gary Guo Date: Tue, 21 Jul 2020 02:28:51 +0100 Subject: [PATCH 2/2] Expand test to cover type_name and monomorphic use --- src/test/ui/consts/issue-73976-monomorphic.rs | 36 +++++++++++++++++++ ...ue-73976.rs => issue-73976-polymorphic.rs} | 16 ++++++++- .../ui/consts/issue-73976-polymorphic.stderr | 26 ++++++++++++++ src/test/ui/consts/issue-73976.stderr | 14 -------- 4 files changed, 77 insertions(+), 15 deletions(-) create mode 100644 src/test/ui/consts/issue-73976-monomorphic.rs rename src/test/ui/consts/{issue-73976.rs => issue-73976-polymorphic.rs} (62%) create mode 100644 src/test/ui/consts/issue-73976-polymorphic.stderr delete mode 100644 src/test/ui/consts/issue-73976.stderr diff --git a/src/test/ui/consts/issue-73976-monomorphic.rs b/src/test/ui/consts/issue-73976-monomorphic.rs new file mode 100644 index 0000000000000..7706a97f23b48 --- /dev/null +++ b/src/test/ui/consts/issue-73976-monomorphic.rs @@ -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); + +impl GetTypeId { + pub const VALUE: TypeId = TypeId::of::(); +} + +const fn check_type_id() -> bool { + matches!(GetTypeId::::VALUE, GetTypeId::::VALUE) +} + +pub struct GetTypeNameLen(T); + +impl GetTypeNameLen { + pub const VALUE: usize = any::type_name::().len(); +} + +const fn check_type_name_len() -> bool { + matches!(GetTypeNameLen::::VALUE, GetTypeNameLen::::VALUE) +} + +fn main() { + assert!(check_type_id::()); + assert!(check_type_name_len::()); +} diff --git a/src/test/ui/consts/issue-73976.rs b/src/test/ui/consts/issue-73976-polymorphic.rs similarity index 62% rename from src/test/ui/consts/issue-73976.rs rename to src/test/ui/consts/issue-73976-polymorphic.rs index ef141791c2cc8..28b84518719a1 100644 --- a/src/test/ui/consts/issue-73976.rs +++ b/src/test/ui/consts/issue-73976-polymorphic.rs @@ -6,8 +6,9 @@ // Currently we just disallow this usage and require pattern is monomorphic. #![feature(const_type_id)] +#![feature(const_type_name)] -use std::any::TypeId; +use std::any::{self, TypeId}; pub struct GetTypeId(T); @@ -21,6 +22,19 @@ const fn check_type_id() -> bool { //~| ERROR could not evaluate constant pattern } +pub struct GetTypeNameLen(T); + +impl GetTypeNameLen { + pub const VALUE: usize = any::type_name::().len(); +} + +const fn check_type_name_len() -> bool { + matches!(GetTypeNameLen::::VALUE, GetTypeNameLen::::VALUE) + //~^ ERROR could not evaluate constant pattern + //~| ERROR could not evaluate constant pattern +} + fn main() { assert!(check_type_id::()); + assert!(check_type_name_len::()); } diff --git a/src/test/ui/consts/issue-73976-polymorphic.stderr b/src/test/ui/consts/issue-73976-polymorphic.stderr new file mode 100644 index 0000000000000..c90ce2bd06a67 --- /dev/null +++ b/src/test/ui/consts/issue-73976-polymorphic.stderr @@ -0,0 +1,26 @@ +error: could not evaluate constant pattern + --> $DIR/issue-73976-polymorphic.rs:20:37 + | +LL | matches!(GetTypeId::::VALUE, GetTypeId::::VALUE) + | ^^^^^^^^^^^^^^^^^^^^^ + +error: could not evaluate constant pattern + --> $DIR/issue-73976-polymorphic.rs:32:42 + | +LL | matches!(GetTypeNameLen::::VALUE, GetTypeNameLen::::VALUE) + | ^^^^^^^^^^^^^^^^^^^^^^^^^^ + +error: could not evaluate constant pattern + --> $DIR/issue-73976-polymorphic.rs:20:37 + | +LL | matches!(GetTypeId::::VALUE, GetTypeId::::VALUE) + | ^^^^^^^^^^^^^^^^^^^^^ + +error: could not evaluate constant pattern + --> $DIR/issue-73976-polymorphic.rs:32:42 + | +LL | matches!(GetTypeNameLen::::VALUE, GetTypeNameLen::::VALUE) + | ^^^^^^^^^^^^^^^^^^^^^^^^^^ + +error: aborting due to 4 previous errors + diff --git a/src/test/ui/consts/issue-73976.stderr b/src/test/ui/consts/issue-73976.stderr deleted file mode 100644 index dbb7690b849c8..0000000000000 --- a/src/test/ui/consts/issue-73976.stderr +++ /dev/null @@ -1,14 +0,0 @@ -error: could not evaluate constant pattern - --> $DIR/issue-73976.rs:19:37 - | -LL | matches!(GetTypeId::::VALUE, GetTypeId::::VALUE) - | ^^^^^^^^^^^^^^^^^^^^^ - -error: could not evaluate constant pattern - --> $DIR/issue-73976.rs:19:37 - | -LL | matches!(GetTypeId::::VALUE, GetTypeId::::VALUE) - | ^^^^^^^^^^^^^^^^^^^^^ - -error: aborting due to 2 previous errors -