Skip to content
New issue

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

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

Already on GitHub? # to your account

Don't elaborate associated types with Sized bounds in trait_object_ty in cfi #127882

Merged
merged 1 commit into from
Jul 29, 2024

Conversation

compiler-errors
Copy link
Member

The elaboration mechanism introduced in #123005 didn't filter for associated types with Self: Sized bounds, which since #112319 has excluded them from the object type.

Fixes #127881
cc @maurer @rcvalle

@rustbot
Copy link
Collaborator

rustbot commented Jul 17, 2024

r? @pnkfelix

rustbot has assigned @pnkfelix.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added PG-exploit-mitigations Project group: Exploit mitigations 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 Jul 17, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jul 17, 2024

Some changes occurred in tests/ui/sanitizer

cc @rust-lang/project-exploit-mitigations, @rcvalle

Some changes occurred in compiler/rustc_sanitizers

cc @rust-lang/project-exploit-mitigations, @rcvalle

// Check that we only elaborate non-`Self: Sized` associated types when
// erasing the receiver from trait ref.

//@ revisions: cfi kcfi
Copy link
Member Author

Choose a reason for hiding this comment

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

Just copied this from another test.

@maurer
Copy link
Contributor

maurer commented Jul 17, 2024

This looks correct to me.

@rcvalle
Copy link
Member

rcvalle commented Jul 18, 2024

LGTM (@pnkfelix FYI). Thank you for your time and for working on this, @compiler-errors! Much appreciated.

@compiler-errors
Copy link
Member Author

r? compiler

@rustbot rustbot assigned chenyukang and unassigned pnkfelix Jul 24, 2024
@oli-obk
Copy link
Contributor

oli-obk commented Jul 29, 2024

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jul 29, 2024

📌 Commit 29f5d8f has been approved by oli-obk

It is now in the queue for this repository.

@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 29, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 29, 2024
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#127882 (Don't elaborate associated types with Sized bounds in `trait_object_ty` in cfi)
 - rust-lang#128174 (Don't record trait aliases as marker traits)
 - rust-lang#128202 (Tell users not to file a bug when using internal library features)
 - rust-lang#128239 (Don't ICE when encountering error regions when confirming object method candidate)
 - rust-lang#128337 (skip assoc type during infer source visitor)
 - rust-lang#128341 (Make `rustc_attr::parse_version` pub)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 29, 2024
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#127882 (Don't elaborate associated types with Sized bounds in `trait_object_ty` in cfi)
 - rust-lang#128174 (Don't record trait aliases as marker traits)
 - rust-lang#128202 (Tell users not to file a bug when using internal library features)
 - rust-lang#128239 (Don't ICE when encountering error regions when confirming object method candidate)
 - rust-lang#128337 (skip assoc type during infer source visitor)
 - rust-lang#128341 (Make `rustc_attr::parse_version` pub)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 2e9d962 into rust-lang:master Jul 29, 2024
6 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Jul 29, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 29, 2024
Rollup merge of rust-lang#127882 - compiler-errors:cfi-sized-self-gat, r=oli-obk

Don't elaborate associated types with Sized bounds in `trait_object_ty` in cfi

The elaboration mechanism introduced in rust-lang#123005 didn't filter for associated types with `Self: Sized` bounds, which since rust-lang#112319 has excluded them from the object type.

Fixes rust-lang#127881
cc `@maurer` `@rcvalle`
# for free to join this conversation on GitHub. Already have an account? # 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: typeid_for_instance: couldn't get fn_abi of instance
8 participants