Rollup of 7 pull requests #131158

matthiaskrgr · 2024-10-02T15:10:48Z

Successful merges:

Relax a debug assertion for dyn principal *equality* in codegen #130863 (Relax a debug assertion for dyn principal equality in codegen)
Apple: Do not specify an SDK version in rlib object files #131016 (Apple: Do not specify an SDK version in rlib object files)
Handle rustc_hir_analysis cases of potential_query_instability lint #131140 (Handle rustc_hir_analysis cases of potential_query_instability lint)
mpmc doctest: make sure main thread waits for child threads #131141 (mpmc doctest: make sure main thread waits for child threads)
only query params_in_repr if def kind is adt #131150 (only query params_in_repr if def kind is adt)
Replace zero-width whitespace with a visible \ in the PR template #131151 (Replace zero-width whitespace with a visible \ in the PR template)
Improve const traits diagnostics for new desugaring #131152 (Improve const traits diagnostics for new desugaring)

r? @ghost
@rustbot modify labels: rollup

This is unnecessary, since it ends up being overwritten when linking anyhow, and it feels wrong to embed some arbitrary SDK version in here.

…ity` lint

People tried to copy the `r?` which had an invisible zero-width whitespace, causing rustbot to not recognize the instruction, and which makes it difficult to figure out why it didn't work.

…assert, r=lcnr Relax a debug assertion for dyn principal *equality* in codegen Maybe this sucks and I should just bite the bullet and use `infcx.sub` here. Thoughts? r? lcnr Fixes rust-lang#130855

…r=jieyouxu Apple: Do not specify an SDK version in `rlib` object files This was added in rust-lang#114114, but is unnecessary, since it ends up being overwritten when linking anyhow, and it feels wrong to embed some arbitrary SDK version in here. The object files produced by LLVM also do not set this, and the tooling shows `n/a` when it's `0`, so it seems to genuinely be optional in object files. I've also added a test for the different places the SDK version shows up, and documented a bit more in the code how SDK versions work. See rust-lang#129432 for the bigger picture. Tested with (excludes the same few targets as in rust-lang#130435): ```console ./x test tests/run-make/apple-sdk-version --target aarch64-apple-darwin,aarch64-apple-ios,aarch64-apple-ios-macabi,aarch64-apple-ios-sim,aarch64-apple-tvos,aarch64-apple-tvos-sim,aarch64-apple-visionos,aarch64-apple-visionos-sim,aarch64-apple-watchos,aarch64-apple-watchos-sim,arm64_32-apple-watchos,armv7k-apple-watchos,armv7s-apple-ios,x86_64-apple-darwin,x86_64-apple-ios,x86_64-apple-ios-macabi,x86_64-apple-tvos,x86_64-apple-watchos-sim,x86_64h-apple-darwin IPHONEOS_DEPLOYMENT_TARGET=10.0 ./x test tests/run-make/apple-sdk-version --target=i386-apple-ios ``` CC `@BlackHoleFox,` you [originally commented on these values](rust-lang#114114 (comment)). `@rustbot` label O-apple

…y-instability-lint-for-rustc-hir-analysis, r=compiler-errors Handle `rustc_hir_analysis` cases of `potential_query_instability` lint This PR removes `#![allow(rustc::potential_query_instability)]` line from [`compiler/rustc_hir_analysis/src/lib.rs`](https://github.com/rust-lang/rust/blob/master/compiler/rustc_hir_analysis/src/lib.rs#L61) and converts `FxHash{Map,Set}` types into `FxIndex{Map,Set}` to suppress lint errors. A somewhat tracking issue: rust-lang#84447

mpmc doctest: make sure main thread waits for child threads Currently, chances are half the test is not executed because the main thread exits while the other threads are still working. Cc `@obeis` `@Amanieu`

only query `params_in_repr` if def kind is adt Fixes rust-lang#128327 `params_in_repr` was only stored in `encode_info_for_adt`, so we only query it when the def kind belongs to them. https://github.com/rust-lang/rust/blob/9e3e5174462afaf6c3b9db9b35c6d1934521848a/compiler/rustc_metadata/src/rmeta/encoder.rs#L1566-L1567

Replace zero-width whitespace with a visible `\` in the PR template People (incl. myself) tried to copy the `r?` which had an invisible zero-width whitespace (meaning it was actually more like `r⌴?`), causing rustbot to not recognize the instruction, and which makes it difficult to figure out why it didn't work. This PR replaces the zero-width whitespace with a visible `\` alongside a comment to remove the `\`. It's a bit less "visual", but at least it's visible why the rustbot assignment doesn't work.

…er-errors Improve const traits diagnostics for new desugaring r? project-const-traits

matthiaskrgr · 2024-10-02T15:11:14Z

@bors r+ rollup=never p=7

bors · 2024-10-02T15:11:19Z

📌 Commit b38f7ad has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-10-02T16:24:09Z

⌛ Testing commit b38f7ad with merge 5384697...

rust-highfive · 2024-10-02T19:19:29Z

📣 Toolstate changed by #131158!

Tested on commit 5384697.
Direct link to PR: #131158

🎉 reference on windows: test-fail → test-pass (cc @matthewjasper @ehuss @Havvy).
🎉 reference on linux: test-fail → test-pass (cc @matthewjasper @ehuss @Havvy).

@matthewjasper

Tested on commit rust-lang/rust@5384697. Direct link to PR: <rust-lang/rust#131158> 🎉 reference on windows: test-fail → test-pass (cc @matthewjasper @ehuss @Havvy). 🎉 reference on linux: test-fail → test-pass (cc @matthewjasper @ehuss @Havvy).

bors · 2024-10-02T19:20:36Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 5384697 to master...

rust-timer · 2024-10-02T19:22:34Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#130863	Relax a debug assertion for dyn principal equality in cod…	`1959d9fe2a9c6645a6813155bd09d93c7a69dc8c` (link)
#131016	Apple: Do not specify an SDK version in `rlib` object files	`e5efe144120690d6f8b9090c9ce72d1ce38d35d3` (link)
#131140	Handle `rustc_hir_analysis` cases of `potential_query_insta…	`7f95575e8aaa75d56199312f8aa0618db438ed5f` (link)
#131141	mpmc doctest: make sure main thread waits for child threads	`e34bbc51fde11289afe9273c1c4f22cd8b3f7ce1` (link)
#131150	only query `params_in_repr` if def kind is adt	`b7e2b082bb1d95a22e4ec7bc1736010f021c77de` (link)
#131151	Replace zero-width whitespace with a visible `\` in the PR …	`152a662e00dc3fb5416959aaa595f1ce236c1cd7` (link)
#131152	Improve const traits diagnostics for new desugaring	`058ec14743b8ee9a019334c3333a2a09ccdc5d03` (link)

previous master: 44722bd9ba

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2024-10-02T23:23:32Z

Finished benchmarking commit (5384697): comparison URL.

Overall result: ❌✅ regressions and improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	0.3%	[0.3%, 0.3%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.8%	[-2.9%, -0.1%]	4
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary 1.3%, secondary 1.4%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	1.3%	[1.0%, 1.5%]	3
Regressions ❌ (secondary)	2.7%	[2.6%, 2.7%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.0%	[-1.0%, -1.0%]	1
All ❌✅ (primary)	1.3%	[1.0%, 1.5%]	3

Cycles

Results (secondary -2.9%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.9%	[-2.9%, -2.9%]	1
All ❌✅ (primary)	-	-	0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 769.495s -> 771.629s (0.28%)
Artifact size: 341.49 MiB -> 341.52 MiB (0.01%)

madsmtm and others added 17 commits September 29, 2024 14:45

Document a bit more how the SDK version actually works

0bebedd

Add run-make test to check the SDK version(s) that rustc produces

8964c48

Do not specify an SDK version in object files

6b06ceb

This is unnecessary, since it ends up being overwritten when linking anyhow, and it feels wrong to embed some arbitrary SDK version in here.

Relax a debug assertion in codegen

eb75d20

Relate binders explicitly, do a leak check too

cbb5047

Handle rustc-hir-analysis cases of `rustc::potential_query_instabil…

807e812

…ity` lint

mpmc doctest: make sure main thread waits for child threads

9fa1205

only query params_in_repr if def kind is adt

e9b2d09

Replace zero-width whitespace with a visible \

aa3251d

People tried to copy the `r?` which had an invisible zero-width whitespace, causing rustbot to not recognize the instruction, and which makes it difficult to figure out why it didn't work.

Improve const traits diagnostics for new desugaring

7f6150b

Rollup merge of rust-lang#130863 - compiler-errors:relax-codegen-dyn-…

f9ba552

…assert, r=lcnr Relax a debug assertion for dyn principal *equality* in codegen Maybe this sucks and I should just bite the bullet and use `infcx.sub` here. Thoughts? r? lcnr Fixes rust-lang#130855

Rollup merge of rust-lang#131141 - RalfJung:mpmc-test, r=Amanieu

49f17ff

mpmc doctest: make sure main thread waits for child threads Currently, chances are half the test is not executed because the main thread exits while the other threads are still working. Cc `@obeis` `@Amanieu`

Rollup merge of rust-lang#131152 - fee1-dead-contrib:fxdiag, r=compil…

b38f7ad

…er-errors Improve const traits diagnostics for new desugaring r? project-const-traits

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 Oct 2, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 2, 2024

bors merged commit 5384697 into rust-lang:master Oct 2, 2024
7 checks passed

rustbot added this to the 1.83.0 milestone Oct 2, 2024

bors mentioned this pull request Oct 2, 2024

Move versioned Apple LLVM targets from rustc_target to rustc_codegen_ssa #131037

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #131158

Rollup of 7 pull requests #131158

matthiaskrgr commented Oct 2, 2024

matthiaskrgr commented Oct 2, 2024

bors commented Oct 2, 2024

bors commented Oct 2, 2024

rust-highfive commented Oct 2, 2024

bors commented Oct 2, 2024

rust-timer commented Oct 2, 2024

rust-timer commented Oct 2, 2024

Rollup of 7 pull requests #131158

Rollup of 7 pull requests #131158

Conversation

matthiaskrgr commented Oct 2, 2024

matthiaskrgr commented Oct 2, 2024

bors commented Oct 2, 2024

bors commented Oct 2, 2024

rust-highfive commented Oct 2, 2024

bors commented Oct 2, 2024

rust-timer commented Oct 2, 2024

rust-timer commented Oct 2, 2024

Overall result: ❌✅ regressions and improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size