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.

Sign up for GitHub

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

Jump to bottom

Rollup of 6 pull requests #129275

Merged
merged 13 commits into from
Aug 19, 2024
Merged

Rollup of 6 pull requests #129275

merged 13 commits into from
Aug 19, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ChrisDenton and others added 13 commits August 17, 2024 12:29
@ChrisDenton
Fix bootstrap test detect_src_and_out on Windows
9a9cf2f
@smoelius
Typo
dc47665
@GoldsteinE
Check that #[may_dangle] is properly applied
3a9bf45 
It's only valid when applied to a type or lifetime parameter
in `Drop` trait implementation.
@GoldsteinE
Fix wording of misapplied must_not_suspend error
df6cb95
@jswrenn
safe transmute: forbid reference lifetime extension
17995d5 
Modifies `BikeshedIntrinsicFrom` to forbid lifetime extensions on
references. This static check can be opted out of with the
`Assume::lifetimes` flag.

Fixes rust-lang#129097
@wafarm
Fix wrong argument for get_fn_decl
da7dd43
@futile
Prevent double panic in query system, improve diagnostics
2bf2455
@matthiaskrgr
Rollup merge of rust-lang#129194 - ChrisDenton:detect-src, r=Mark-Sim…
cdb44b7 
…ulacrum

Fix bootstrap test `detect_src_and_out` on Windows

Fixes rust-lang#129188 by making sure it's properly testing the right path for the platform.
@matthiaskrgr
Rollup merge of rust-lang#129217 - jswrenn:transmute-lifetimes, r=com…
5cb30b7 
…piler-errors

safe transmute: check lifetimes

Modifies `BikeshedIntrinsicFrom` to forbid lifetime extensions on references. This static check can be opted out of with the `Assume::lifetimes` flag.

Fixes rust-lang#129097

Tracking Issue: rust-lang#99571

 r​? `@compiler-errors`
@matthiaskrgr
Rollup merge of rust-lang#129223 - wafarm:fix-129215, r=compiler-errors
5ba877c 
 Fix wrong argument for `get_fn_decl`

Closes rust-lang#129215 (seems to be introduced in rust-lang#129168)
@matthiaskrgr
Rollup merge of rust-lang#129235 - GoldsteinE:check-may-dangle, r=com…
7b245e4 
…piler-errors

Check that `#[may_dangle]` is properly applied

It's only valid when applied to a type or lifetime parameter in `Drop` trait implementation.

Tracking issue: rust-lang#34761
cc rust-lang#34761 (comment)
@matthiaskrgr
Rollup merge of rust-lang#129245 - smoelius:patch-1, r=lqd
8dc8589 
Fix a typo in `rustc_hir` doc comment

Fix a typo in a comment.
@matthiaskrgr
Rollup merge of rust-lang#129271 - futile:query-system/prevent-double…
7730356 
…-panic, r=michaelwoerister

Prevent double panic in query system, improve diagnostics

I stumbled upon a double-panic in the query system while working on something else (rust-lang#129102), which hid the real error cause for what I was debugging. This PR remedies that, so unwinding should be able to present more errors. It shouldn't really be relevant for code that doesn't ICE.
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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. rollup A PR which is a rollup labels Aug 19, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Aug 19, 2024

📌 Commit 7730356 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 Aug 19, 2024
@bors
Copy link
Contributor

bors commented Aug 19, 2024

⌛ Testing commit 7730356 with merge 636d7ff...

@bors
Copy link
Contributor

bors commented Aug 19, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 19, 2024
@bors bors merged commit 636d7ff into rust-lang:master Aug 19, 2024
7 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 19, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#129194 Fix bootstrap test detect_src_and_out on Windows 3ef460fcf2a6b4b1eda6eb34cb8afbeffbad0688 (link)
#129217 safe transmute: check lifetimes ba8363925e9a5484905da634d20432f19e7c4c22 (link)
#129223 Fix wrong argument for get_fn_decl 69392e3beb313dc56c9299f4cecd20a9c8c30917 (link)
#129235 Check that #[may_dangle] is properly applied 359bb1e2da5bf8885957a3be7a1326e62af01fd4 (link)
#129245 Fix a typo in rustc_hir doc comment 1d9b0e09a6fc27313f25236cd3189bece5000e0a (link)
#129271 Prevent double panic in query system, improve diagnostics 43e22166b4f2a58ac6e7713f900e83fd19f763bd (link)

previous master: 5601d14249

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
Copy link
Collaborator

Finished benchmarking commit (636d7ff): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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.2% [0.2%, 0.2%] 1
Regressions ❌
(secondary)		 0.2% [0.2%, 0.2%] 8
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -1.0% [-1.0%, -1.0%] 1
All ❌✅ (primary) 0.2% [0.2%, 0.2%] 1

Max RSS (memory usage)

Results (secondary 0.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)		 - - 0
Regressions ❌
(secondary)		 3.0% [1.8%, 5.4%] 3
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -2.1% [-3.1%, -1.6%] 3
All ❌✅ (primary) - - 0

Cycles

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

Binary size

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

Bootstrap: 748.109s -> 751.143s (0.41%)
Artifact size: 336.74 MiB -> 338.64 MiB (0.56%)

@rustbot rustbot added the perf-regression Performance regression. label Aug 20, 2024
@pnkfelix
Copy link
Member

sole primary regression of 0.2% icount is to helloworld doc-full. not worth investigating

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Aug 29, 2024
@matthiaskrgr matthiaskrgr deleted the rollup-qv64hg6 branch September 1, 2024 17:36
@lqd
Copy link
Member

lqd commented Oct 3, 2024

Let's see if this caused the huge artifact size regression maybe

@rust-timer build 43e2216

@rust-timer

This comment has been minimized.

Sign in to view
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (43e2216): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

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.2% [0.2%, 0.2%] 1
Regressions ❌
(secondary)		 0.2% [0.2%, 0.2%] 12
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -0.9% [-0.9%, -0.9%] 1
All ❌✅ (primary) 0.2% [0.2%, 0.2%] 1

Max RSS (memory usage)

Results (secondary 1.3%)

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)		 3.1% [1.9%, 5.5%] 3
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -1.5% [-1.5%, -1.5%] 2
All ❌✅ (primary) - - 0

Cycles

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

Binary size

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

Bootstrap: 748.109s -> 749.241s (0.15%)
Artifact size: 336.74 MiB -> 338.76 MiB (0.60%)

@lqd
Copy link
Member

lqd commented Oct 3, 2024

that's crazy 😆

@lqd
Copy link
Member

lqd commented Oct 3, 2024

No size change on a revert https://perf.rust-lang.org/compare.html?start=f7c8928f035370be33463bb7f1cd1aeca2c5f898&end=f3f71ef8d1bb4945f72574bcbce32ee2b2fb7c6d&stat=instructions%3Au&tab=artifact-size

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.
Projects
None yet
Milestone
1.82.0
Development

Successfully merging this pull request may close these issues.