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.

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

CFI: Fix cfi with repr(transparent): transform_ty: unexpected Alias(Proj #112182

Merged
merged 1 commit into from Jun 2, 2023

Conversation

rcvalle
Copy link
Member

@rcvalle rcvalle commented Jun 1, 2023

Fixes #111185 by normalizing ty::Alias before encoding.

@rustbot
Copy link
Collaborator

rustbot commented Jun 1, 2023

r? @b-naber

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

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 1, 2023
@rcvalle
Copy link
Member Author

rcvalle commented Jun 1, 2023

r? @bjorn3

@rustbot rustbot assigned bjorn3 and unassigned b-naber Jun 1, 2023
@rcvalle rcvalle added the PG-exploit-mitigations Project group: Exploit mitigations label Jun 1, 2023
@rcvalle
Copy link
Member Author

rcvalle commented Jun 1, 2023

CC @compiler-errors

Copy link
Member

@compiler-errors compiler-errors left a comment

Choose a reason for hiding this comment

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

This is fine for now.

It may have some strange interactions with typeid_for_instance, since as I think I've pointed out in a previous PR, it's (probably) not correct to be using the unsubstituted impl trait ref in that PR. But that's not really a blocker on this PR.

@compiler-errors
Copy link
Member

r? @compiler-errors @bors r+

@bors
Copy link
Contributor

bors commented Jun 1, 2023

📌 Commit faf31b5 has been approved by compiler-errors

It is now in the queue for this repository.

@rustbot rustbot assigned compiler-errors and unassigned bjorn3 Jun 1, 2023
@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 Jun 1, 2023
@rcvalle
Copy link
Member Author

rcvalle commented Jun 1, 2023

Thank you for your time and for your help on this, @compiler-errors! Much appreciated. (I'll also go back and check what you pointed out in our discussions in the previous PR as soon as I've a chance.)

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 2, 2023
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#111647 (use c literals in compiler and library)
 - rust-lang#112165 (Rename `impl_defaultness` to `defaultness`)
 - rust-lang#112182 (CFI: Fix cfi with repr(transparent): transform_ty: unexpected Alias(Proj)
 - rust-lang#112189 (Debug-assert that closures and generators are made with the right number of substitutions)
 - rust-lang#112205 (Add rustdoc test for double-hyphen to dash doc comment conversion)
 - rust-lang#112206 (Fix typo in `std::cell` module docs)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ec51b15 into rust-lang:master Jun 2, 2023
11 checks passed
@rustbot rustbot added this to the 1.72.0 milestone Jun 2, 2023
@rcvalle rcvalle deleted the rust-cfi-fix-111185 branch April 22, 2024 23:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PG-exploit-mitigations Project group: Exploit mitigations S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ice: cfi with repr(transparent): transform_ty: unexpected Alias(Projection, AliasTy`
7 participants