Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Guard against non-monomorphized type_id intrinsic call #74538

Merged
merged 2 commits into from
Jul 23, 2020
Merged

Guard against non-monomorphized type_id intrinsic call #74538

merged 2 commits into from
Jul 23, 2020

Conversation

nbdd0121
Copy link
Contributor

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

@rust-highfive
Copy link
Collaborator

r? @lcnr

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 19, 2020
lcnr
lcnr approved these changes Jul 20, 2020
View reviewed changes
Copy link
Contributor

@lcnr lcnr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also add a test for type_name?

Something like

#![feature(const_type_name)]

fn test<T: 'static>() {
    let _ = [0; {
        std::any::type_name::<T>();
        7
    }];
    //~^ ERROR constant expression depends on a generic parameter
}

@lcnr
Copy link
Contributor

lcnr commented Jul 20, 2020

We also probably want a test using type_name or type_id in a fully monomorphic pattern here to see that this doesn't break

@nbdd0121
Copy link
Contributor Author

Added.

@lcnr
Copy link
Contributor

lcnr commented Jul 21, 2020

Thanks @bors r+ rollup=always

@bors
Copy link
Contributor

bors commented Jul 21, 2020

📌 Commit b3340b5 has been approved by lcnr

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 21, 2020
@lcnr lcnr mentioned this pull request Jul 21, 2020
Merged
@KodrAus KodrAus mentioned this pull request Jul 22, 2020
Merged
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 22, 2020
@Manishearth
Rollup merge of rust-lang#74538 - nbdd0121:issue-73976, r=lcnr
eb8a5cb 
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 rust-lang#73976
@Manishearth Manishearth mentioned this pull request Jul 22, 2020
Closed
@davidtwco davidtwco mentioned this pull request Jul 22, 2020
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 22, 2020
@Manishearth
Rollup merge of rust-lang#74538 - nbdd0121:issue-73976, r=lcnr
e46546d 
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 rust-lang#73976
@Manishearth Manishearth mentioned this pull request Jul 22, 2020
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 22, 2020
@Manishearth
Rollup merge of rust-lang#74538 - nbdd0121:issue-73976, r=lcnr
988b075 
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 rust-lang#73976
@Manishearth Manishearth mentioned this pull request Jul 22, 2020
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 22, 2020
@Manishearth
Rollup merge of rust-lang#74538 - nbdd0121:issue-73976, r=lcnr
6b829d9 
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 rust-lang#73976
@Manishearth Manishearth mentioned this pull request Jul 22, 2020
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 22, 2020
@Manishearth
Rollup merge of rust-lang#74538 - nbdd0121:issue-73976, r=lcnr
2642664 
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 rust-lang#73976
@Manishearth Manishearth mentioned this pull request Jul 22, 2020
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 22, 2020
@Manishearth
Rollup merge of rust-lang#74538 - nbdd0121:issue-73976, r=lcnr
26dbd93 
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 rust-lang#73976
@Manishearth Manishearth mentioned this pull request Jul 22, 2020
Closed
@Manishearth Manishearth mentioned this pull request Jul 22, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 23, 2020
@bors
Auto merge of rust-lang#74662 - Manishearth:rollup-jdt7t71, r=Manishe…
e8b55a4 
…arth

Rollup of 9 pull requests

Successful merges:

 - rust-lang#73783 (Detect when `'static` obligation might come from an `impl`)
 - rust-lang#73868 (Advertise correct stable version for const control flow)
 - rust-lang#74460 (rustdoc: Always warn when linking from public to private items)
 - rust-lang#74538 (Guard against non-monomorphized type_id intrinsic call)
 - rust-lang#74541 (Add the aarch64-apple-darwin target )
 - rust-lang#74600 (Enable perf try builder)
 - rust-lang#74618 (Do not ICE on assoc type with bad placeholder)
 - rust-lang#74631 (rustc_target: Add a target spec option for disabling `--eh-frame-hdr`)
 - rust-lang#74643 (build: Remove unnecessary `cargo:rerun-if-env-changed` annotations)

Failed merges:

r? @ghost
@bors bors merged commit 4828895 into rust-lang:master Jul 23, 2020
@nbdd0121 nbdd0121 mentioned this pull request Jul 30, 2020
Merged
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 30, 2020
@Manishearth
Rollup merge of rust-lang#74934 - nbdd0121:issue-73976, r=ecstatic-morse
b0d4261 
Improve diagnostics when constant pattern is too generic

This PR is a follow-up to PR rust-lang#74538 and issue rust-lang#73976

When constants queries Layout, TypeId or type_name of a generic parameter, instead of emitting `could not evaluate constant pattern`, we will instead emit a more detailed message `constant pattern depends on a generic parameter`.
@davidtwco davidtwco mentioned this pull request Aug 9, 2020
Open
2 tasks
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 9, 2020
@bors
Auto merge of rust-lang#74595 - lcnr:ConstEvaluatable-fut-compat, r=o…
e2be5f5 
…li-obk

make `ConstEvaluatable` more strict

relevant zulip discussion: https://rust-lang.zulipchat.com/#narrow/stream/146212-t-compiler.2Fconst-eval/topic/.60ConstEvaluatable.60.20generic.20functions/near/204125452

Let's see how much this impacts. Depending on how this goes this should probably be a future compat warning.

Short explanation: we currently forbid anonymous constants which depend on generic types, e.g. `[0; std::mem::size_of::<T>]` currently errors.

We previously checked this by evaluating the constant and returned an error if that failed. This however allows things like
```rust
const fn foo<T>() -> usize {
    if std::mem::size_of::<*mut T>() < 8 { // size of *mut T does not depend on T
        std::mem::size_of::<T>()
    } else {
        8
    }
}

fn test<T>() {
    let _ = [0; foo::<T>()];
}
```
which is a backwards compatibility hazard. This also has worrying interactions with mir optimizations (rust-lang#74491 (comment)) and intrinsics (rust-lang#74538).

r? `@oli-obk` `@eddyb`
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lcnr lcnr lcnr approved these changes

Assignees

@lcnr lcnr

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.47.0
Development

Successfully merging this pull request may close these issues.

TypeId doesn't match itself in generic function.
5 participants
@nbdd0121 @rust-highfive @lcnr @bors @cuviper