CFI: Support complex receivers by maurer · Pull Request #123005 · rust-lang/rust

maurer · 2024-03-24T16:10:10Z

Right now, we only support rewriting &self and &mut self into &dyn MyTrait and &mut dyn MyTrait. This expands it to handle the full gamut of receivers by calculating the receiver based on substitution rather than based on a rewrite. This means that, for example, Arc<Self> will become Arc<dyn MyTrait> appropriately with this change.

This approach also allows us to support associated type constraints as well, so we will correctly rewrite &self into &dyn MyTrait<T=i32>, for example.

r? @workingjubilee

rustbot · 2024-03-24T16:10:19Z

Some changes occurred in tests/ui/sanitizer

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

Some changes occurred in compiler/rustc_symbol_mangling/src/typeid

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

compiler/rustc_middle/src/query/mod.rs

compiler-errors · 2024-03-24T16:17:20Z

r? compiler-errors

compiler/rustc_trait_selection/src/traits/vtable.rs

workingjubilee · 2024-03-24T16:38:32Z

yeah my ability to say much pretty much dies above cg_ssa.

rustbot · 2024-03-24T17:37:18Z

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

maurer · 2024-03-24T17:39:43Z

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged. Otherwise, you can ignore this comment.

This happened because moving the query into the mangler resulted in a new dep on rustc_infer. If there's another way I should do this, let me know and I'll adjust.

compiler-errors · 2024-03-24T17:42:45Z

I'll take another look in a few hours, since I'm on a run. The approach makes sense, but I'll probably leave some suggestions for comments for why it's correct.

compiler/rustc_symbol_mangling/src/typeid/typeid_itanium_cxx_abi.rs

compiler-errors

Few tweaks

compiler/rustc_symbol_mangling/src/typeid/typeid_itanium_cxx_abi.rs

Previously, we only rewrote `&self` and `&mut self` receivers. By instantiating the method from the trait definition, we can make this work work with arbitrary legal receivers instead.

compiler-errors · 2024-03-24T23:54:56Z

@bors r+

bors · 2024-03-24T23:54:58Z

📌 Commit 40f41e7 has been approved by compiler-errors

It is now in the queue for this repository.

…compiler-errors CFI: Support complex receivers Right now, we only support rewriting `&self` and `&mut self` into `&dyn MyTrait` and `&mut dyn MyTrait`. This expands it to handle the full gamut of receivers by calculating the receiver based on *substitution* rather than based on a rewrite. This means that, for example, `Arc<Self>` will become `Arc<dyn MyTrait>` appropriately with this change. This approach also allows us to support associated type constraints as well, so we will correctly rewrite `&self` into `&dyn MyTrait<T=i32>`, for example. r? `@workingjubilee`

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#122802 (Provide structured suggestion for unconstrained generic constant) - rust-lang#122858 (Tweak `parse_dot_suffix_expr`) - rust-lang#122923 (In `pretty_print_type()`, print `async fn` futures' paths instead of spans.) - rust-lang#122990 (Clarify transmute example) - rust-lang#122995 (Clean up unnecessary headers/flags in coverage mir-opt tests) - rust-lang#123003 (CFI: Handle dyn with no principal) - rust-lang#123005 (CFI: Support complex receivers) - rust-lang#123020 (Temporarily remove nnethercote from the review rotation.) r? `@ghost` `@rustbot` modify labels: rollup

…compiler-errors CFI: Support complex receivers Right now, we only support rewriting `&self` and `&mut self` into `&dyn MyTrait` and `&mut dyn MyTrait`. This expands it to handle the full gamut of receivers by calculating the receiver based on *substitution* rather than based on a rewrite. This means that, for example, `Arc<Self>` will become `Arc<dyn MyTrait>` appropriately with this change. This approach also allows us to support associated type constraints as well, so we will correctly rewrite `&self` into `&dyn MyTrait<T=i32>`, for example. r? ``@workingjubilee``

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#120557 (Add rust-lldb pretty printing for Path and PathBuf) - rust-lang#122802 (Provide structured suggestion for unconstrained generic constant) - rust-lang#122858 (Tweak `parse_dot_suffix_expr`) - rust-lang#122990 (Clarify transmute example) - rust-lang#122995 (Clean up unnecessary headers/flags in coverage mir-opt tests) - rust-lang#123003 (CFI: Handle dyn with no principal) - rust-lang#123005 (CFI: Support complex receivers) - rust-lang#123020 (Temporarily remove nnethercote from the review rotation.) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#122858 (Tweak `parse_dot_suffix_expr`) - rust-lang#122982 (Add more comments to the bootstrap code that handles `tests/coverage`) - rust-lang#122990 (Clarify transmute example) - rust-lang#122995 (Clean up unnecessary headers/flags in coverage mir-opt tests) - rust-lang#123003 (CFI: Handle dyn with no principal) - rust-lang#123005 (CFI: Support complex receivers) - rust-lang#123020 (Temporarily remove nnethercote from the review rotation.) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#123005 - maurer:cfi-arbitrary-receivers, r=compiler-errors CFI: Support complex receivers Right now, we only support rewriting `&self` and `&mut self` into `&dyn MyTrait` and `&mut dyn MyTrait`. This expands it to handle the full gamut of receivers by calculating the receiver based on *substitution* rather than based on a rewrite. This means that, for example, `Arc<Self>` will become `Arc<dyn MyTrait>` appropriately with this change. This approach also allows us to support associated type constraints as well, so we will correctly rewrite `&self` into `&dyn MyTrait<T=i32>`, for example. r? ```@workingjubilee```

…, 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`

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`

rustbot assigned workingjubilee Mar 24, 2024

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 Mar 24, 2024

compiler-errors reviewed Mar 24, 2024

View reviewed changes

compiler/rustc_middle/src/query/mod.rs Outdated Show resolved Hide resolved

rustbot assigned compiler-errors and unassigned workingjubilee Mar 24, 2024

compiler-errors reviewed Mar 24, 2024

View reviewed changes

compiler/rustc_trait_selection/src/traits/vtable.rs Outdated Show resolved Hide resolved

maurer force-pushed the cfi-arbitrary-receivers branch from e149471 to c84586c Compare March 24, 2024 17:37

maurer commented Mar 24, 2024

View reviewed changes

compiler/rustc_symbol_mangling/src/typeid/typeid_itanium_cxx_abi.rs Outdated Show resolved Hide resolved

maurer force-pushed the cfi-arbitrary-receivers branch from c84586c to bd30628 Compare March 24, 2024 19:31

compiler-errors suggested changes Mar 24, 2024

View reviewed changes

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 24, 2024

maurer force-pushed the cfi-arbitrary-receivers branch from bd30628 to 46d100b Compare March 24, 2024 21:24

compiler-errors reviewed Mar 24, 2024

View reviewed changes

compiler/rustc_symbol_mangling/src/typeid/typeid_itanium_cxx_abi.rs Outdated Show resolved Hide resolved

compiler/rustc_symbol_mangling/src/typeid/typeid_itanium_cxx_abi.rs Outdated Show resolved Hide resolved

maurer force-pushed the cfi-arbitrary-receivers branch from 46d100b to da32112 Compare March 24, 2024 22:35

maurer requested a review from compiler-errors March 24, 2024 22:36

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 24, 2024

compiler-errors reviewed Mar 24, 2024

View reviewed changes

compiler/rustc_symbol_mangling/src/typeid/typeid_itanium_cxx_abi.rs Outdated Show resolved Hide resolved

compiler-errors approved these changes Mar 24, 2024

View reviewed changes

CFI: Support arbitrary receivers

40f41e7

Previously, we only rewrote `&self` and `&mut self` receivers. By instantiating the method from the trait definition, we can make this work work with arbitrary legal receivers instead.

maurer force-pushed the cfi-arbitrary-receivers branch from da32112 to 40f41e7 Compare March 24, 2024 22:47

compiler-errors approved these changes Mar 24, 2024

View reviewed changes

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 Mar 24, 2024

matthiaskrgr mentioned this pull request Mar 25, 2024

Rollup of 8 pull requests #123023

Closed

matthiaskrgr mentioned this pull request Mar 25, 2024

Rollup of 8 pull requests #123027

Closed

matthiaskrgr mentioned this pull request Mar 25, 2024

Rollup of 7 pull requests #123029

Merged

bors merged commit fe0222b into rust-lang:master Mar 25, 2024

rustbot added this to the 1.79.0 milestone Mar 25, 2024

matthiaskrgr mentioned this pull request Mar 25, 2024

ICE: CFI: typeid_for_instance: couldn't get fn_abi of instance Layout(ReferencesError(ErrorGuaranteed(()))) #123053

Closed

compiler-errors mentioned this pull request Jul 17, 2024

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

Merged

Uh oh!

Conversation

maurer commented Mar 24, 2024

Uh oh!

rustbot commented Mar 24, 2024

Uh oh!

Uh oh!

compiler-errors commented Mar 24, 2024

Uh oh!

Uh oh!

workingjubilee commented Mar 24, 2024

Uh oh!

rustbot commented Mar 24, 2024

Uh oh!

maurer commented Mar 24, 2024

Uh oh!

compiler-errors commented Mar 24, 2024

Uh oh!

Uh oh!

compiler-errors left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

compiler-errors commented Mar 24, 2024

Uh oh!

bors commented Mar 24, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants