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

Rollup of 3 pull requests #123771

Closed
wants to merge 8 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

niluxv and others added 8 commits April 5, 2024 14:33
Unify the output of `suggest_assign_value` and `ty_kind_suggestion`.

Ideally we'd make these a single function, but doing so would likely require modify the crate dependency tree.
Add handling for `String`, `Box`, `Option` and `Result`.
…manieu

Refactor `panic_unwind/seh.rs` pointer use

* `x86` now conforms to strict-provenance
* `x86_64` now uses the expose API (instead of `as` casts)
* changed `ptr_t` from a type alias to a `repr(transparent)` struct for some extra type-safety
* replaced the `ptr!` macro by methods on `ptr_t`, as there is now no reason (as far as I can see) anymore to use a macro

On `x86_64` pointers in SEH are represented by 32-bit offsets from `__ImageBase`, so we can't use a pointer type. It might be possible to leak the provenance into the FFI by using a `MaybeUninit<u32>` instead of a `u32`, but that is a bit more involved than using expose, and I'm not sure that would be worth it.
…errors

Tweak value suggestions in `borrowck` and `hir_analysis`

Unify the output of `suggest_assign_value` and `ty_kind_suggestion`.

Ideally we'd make these a single function, but doing so would likely require modify the crate dependency tree.
…ve, r=jieyouxu

compiletest: error when finding a trailing directive

This PR introduce a supplementary check that when checking for a compiletest directive, will also check that the next "word" after that directive is not also by itself a directive.

This is done to avoid situations like this `//@ only-linux only-x86_64` where one might think that both directives are being taken into account while in fact the second in a comment, and so was ignored, until now.

Related to rust-lang#123730
cc `@scottmcm`
r? `@jieyouxu`
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 11, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=3

@bors
Copy link
Contributor

bors commented Apr 11, 2024

📌 Commit 249d475 has been approved by matthiaskrgr

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

Rollup of 3 pull requests

Successful merges:

 - rust-lang#123490 (Refactor `panic_unwind/seh.rs` pointer use)
 - rust-lang#123704 (Tweak value suggestions in `borrowck` and `hir_analysis`)
 - rust-lang#123753 (compiletest: error when finding a trailing directive)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Apr 11, 2024

⌛ Testing commit 249d475 with merge f401761...

@rust-log-analyzer
Copy link
Collaborator

The job dist-aarch64-msvc failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
   Compiling hashbrown v0.14.3
   Compiling std_detect v0.1.5 (C:\a\rust\rust\library\stdarch\crates\std_detect)
[RUSTC-TIMING] rustc_std_workspace_alloc test:false 0.051
[RUSTC-TIMING] panic_abort test:false 0.055
error[E0511]: invalid monomorphization of `atomic_store_seqcst` intrinsic: expected basic integer type, found `ptr_t`
   --> library\panic_unwind\src\seh.rs:320:5
320 | /     atomic_store_seqcst(
320 | /     atomic_store_seqcst(
321 | |         addr_of_mut!(THROW_INFO.pmfnUnwind).cast(),
322 | |         ptr_t::new(exception_cleanup as *mut u8),
    | |_____^


error[E0511]: invalid monomorphization of `atomic_store_seqcst` intrinsic: expected basic integer type, found `ptr_t`
   --> library\panic_unwind\src\seh.rs:324:5
324 | /     atomic_store_seqcst(
324 | /     atomic_store_seqcst(
325 | |         addr_of_mut!(THROW_INFO.pCatchableTypeArray).cast(),
326 | |         ptr_t::new(addr_of_mut!(CATCHABLE_TYPE_ARRAY).cast()),
    | |_____^


error[E0511]: invalid monomorphization of `atomic_store_seqcst` intrinsic: expected basic integer type, found `ptr_t`
   --> library\panic_unwind\src\seh.rs:328:5
328 | /     atomic_store_seqcst(
328 | /     atomic_store_seqcst(
329 | |         addr_of_mut!(CATCHABLE_TYPE_ARRAY.arrayOfCatchableTypes[0]).cast(),
330 | |         ptr_t::new(addr_of_mut!(CATCHABLE_TYPE).cast()),
    | |_____^


error[E0511]: invalid monomorphization of `atomic_store_seqcst` intrinsic: expected basic integer type, found `ptr_t`
   --> library\panic_unwind\src\seh.rs:332:5
332 | /     atomic_store_seqcst(
332 | /     atomic_store_seqcst(
333 | |         addr_of_mut!(CATCHABLE_TYPE.pType).cast(),
334 | |         ptr_t::new(addr_of_mut!(TYPE_DESCRIPTOR).cast()),
    | |_____^


error[E0511]: invalid monomorphization of `atomic_store_seqcst` intrinsic: expected basic integer type, found `ptr_t`
   --> library\panic_unwind\src\seh.rs:336:5
336 | /     atomic_store_seqcst(
336 | /     atomic_store_seqcst(
337 | |         addr_of_mut!(CATCHABLE_TYPE.copyFunction).cast(),
338 | |         ptr_t::new(exception_copy as *mut u8),
    | |_____^

For more information about this error, try `rustc --explain E0511`.
[RUSTC-TIMING] panic_unwind test:false 0.085

@bors
Copy link
Contributor

bors commented Apr 11, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 11, 2024
@matthiaskrgr matthiaskrgr deleted the rollup-txa88g8 branch September 1, 2024 17:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants