cmse: fix 'region variables should not be hashed' #146649
Merged
+40
−0
Conversation
This file contains hidden or 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
folkertdev
added
the
F-abi_c_cmse_nonsecure_call
|
HIR ty lowering was modified cc @fmease |
rustbot
added
S-waiting-on-review
|
r? lcnr @bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Sep 30, 2025
Rollup of 5 pull requests Successful merges: - #140916 (Fix unuseful span in type error in some format_args!() invocations) - #146011 (Point at fn bound that introduced lifetime obligation) - #146649 (cmse: fix 'region variables should not be hashed') - #147109 (Rename various "concrete opaque type" things to say "hidden type") - #147167 (Don't condition RUSTDOC_LIBDIR on `--no-doc`) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Sep 30, 2025
Rollup merge of #146649 - folkertdev:cmse-call-erase-regions, r=lcnr cmse: fix 'region variables should not be hashed' tracking issue: #81391 fixes #131639 Some background: the `cmse-nonsecure-call` calling convention is used for a call from "secure" to "non-secure" code. To make sure that "non-secure" cannot read any secrets, restrictions are put on the signatures of functions with this calling convention: they can only use 4 arguments for passing arguments, and one register for passing a result. No arguments are passed via the stack, and all other registers are cleared before the call. We check during `hir_ty_lowering` that the signature follows these rules. We do that by determining and then inspecting the layout of the type. That works well overall, but can run into asserts when the type itself is ill-formed. This PR fixes one such case. I believe that the fix here, just erasing the regions, is the right shape, but there may be some nuance that I'm missing. r? types
Zalathar
added a commit
to Zalathar/rust
that referenced
this pull request
Oct 1, 2025
Don't create a top-level `true` directory when running UI tests The funny thing about writing `-Cincremental=true` is that it *does* enable incremental compilation ... using an incremental compilation dir of `./true`. And for UI tests, that ends up creating a `true` directory in the repository root, which is annoying. Fortunately, compiletest has an existing `//@ incremental` directive that takes care of creating an empty incremental directory, and passing it to `-Cincremental`. --- I have manually checked that reverting rust-lang#146649 still causes the updated test to fail.
rust-timer
added a commit
that referenced
this pull request
Oct 1, 2025
Rollup merge of #147217 - Zalathar:true, r=petrochenkov Don't create a top-level `true` directory when running UI tests The funny thing about writing `-Cincremental=true` is that it *does* enable incremental compilation ... using an incremental compilation dir of `./true`. And for UI tests, that ends up creating a `true` directory in the repository root, which is annoying. Fortunately, compiletest has an existing `//@ incremental` directive that takes care of creating an empty incremental directory, and passing it to `-Cincremental`. --- I have manually checked that reverting #146649 still causes the updated test to fail.
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.
tracking issue: #81391
fixes #131639
Some background: the
cmse-nonsecure-callcalling convention is used for a call from "secure" to "non-secure" code. To make sure that "non-secure" cannot read any secrets, restrictions are put on the signatures of functions with this calling convention: they can only use 4 arguments for passing arguments, and one register for passing a result. No arguments are passed via the stack, and all other registers are cleared before the call.We check during
hir_ty_loweringthat the signature follows these rules. We do that by determining and then inspecting the layout of the type. That works well overall, but can run into asserts when the type itself is ill-formed. This PR fixes one such case.I believe that the fix here, just erasing the regions, is the right shape, but there may be some nuance that I'm missing.
r? types