-
Notifications
You must be signed in to change notification settings - Fork 12.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
Showing
4 changed files
with
112 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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>()); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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>()); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
|