CFI: (actually) check that methods are object-safe before projecting their receivers to dyn Trait in CFI
#123066
Conversation
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
rustbot
added
PG-exploit-mitigations
This comment has been minimized.
This comment has been minimized.
fmease
reviewed
Mar 25, 2024
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
`trait_object_ty` assumed that associated types would be fully determined by the trait. This is *almost* true - const parameters and type parameters are no longer allowed, but lifetime parameters are. Since we erase all lifetime parameters anyways, instantiate it with as many erased regions as it needs. Fixes: rust-lang#123053
maurer
force-pushed
the
cfi-erased-lifetime-ice
branch
from
fb6c823
to
70e1d23
Compare
compiler-errors
approved these changes
Mar 25, 2024
|
@bors r+ |
bors
added
S-waiting-on-bors
compiler-errors
changed the title
dyn Trait in CFI
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 26, 2024
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#122766 (store segment and module in `UnresolvedImportError`) - rust-lang#122996 (simplify_branches: add comment) - rust-lang#123047 (triagebot: Add notification of 2024 issues) - rust-lang#123066 (CFI: (actually) check that methods are object-safe before projecting their receivers to `dyn Trait` in CFI) - rust-lang#123067 (match lowering: consistently merge simple or-patterns) - rust-lang#123069 (Revert `cargo update` changes and bump `download-artifact` to v4) - rust-lang#123070 (Add my former address to .mailmap) - rust-lang#123086 (Fix doc link to BufWriter in std::fs::File documentation) - rust-lang#123090 (Remove `CacheSelector` trait now that we can use GATs) - rust-lang#123091 (Delegation: fix ICE on wrong `self` resolution) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 26, 2024
Rollup merge of rust-lang#123066 - maurer:cfi-erased-lifetime-ice, r=compiler-errors CFI: (actually) check that methods are object-safe before projecting their receivers to `dyn Trait` in CFI `trait_object_ty` assumed that associated types would be fully determined by the trait. This is *almost* true - const parameters and type parameters are no longer allowed, but lifetime parameters are. Since we erase all lifetime parameters anyways, instantiate it with as many erased regions as it needs. Fixes: rust-lang#123053 r? `@compiler-errors`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
trait_object_tyassumed that associated types would be fully determined by the trait. This is almost true - const parameters and type parameters are no longer allowed, but lifetime parameters are. Since we erase all lifetime parameters anyways, instantiate it with as many erased regions as it needs.Fixes: #123053
r? @compiler-errors