Rollup of 7 pull requests #130807

tgross35 · 2024-09-24T23:47:53Z

Successful merges:

improve compile errors for invalid ptr-to-ptr casts with trait objects #130234 (improve compile errors for invalid ptr-to-ptr casts with trait objects)
Improve assembly test for CMSE ABIs #130752 (Improve assembly test for CMSE ABIs)
Separate collection of crate-local inherent impls from error tracking #130764 (Separate collection of crate-local inherent impls from error tracking)
Pin memchr to 2.5.0 in the library rather than rustc_ast #130788 (Pin memchr to 2.5.0 in the library rather than rustc_ast)
add InProgress ErrorKind gated behind io_error_inprogress feature #130789 (add InProgress ErrorKind gated behind io_error_inprogress feature)
Mention COMPILETEST_VERBOSE_CRASHES on crash test failure #130793 (Mention COMPILETEST_VERBOSE_CRASHES on crash test failure)
rustdoc: inherit parent's stability where applicable #130798 (rustdoc: inherit parent's stability where applicable)

Failed merges:

Simple validation for unsize coercion in MIR validation #130735 (Simple validation for unsize coercion in MIR validation)

r? @ghost
@rustbot modify labels: rollup

This ensures the code-gen for these ABIs does not change silently. Co-authored-by: Folkert <[email protected]>

The latest versions of `memchr` experience LTO-related issues when compiling for windows-gnu [1], so needs to be pinned. The issue is present in the standard library. `memchr` has been pinned in `rustc_ast`, but since the workspace was recently split, this pin no longer has any effect on library crates. Resolve this by adding `memchr` as an _unused_ dependency in `std`, pinned to 2.5. Additionally, remove the pin in `rustc_ast` to allow non-library crates to upgrade to the latest version. Link: rust-lang#127890 [1]

Co-authored-by: David Tolnay <[email protected]> Co-authored-by: nora <[email protected]>

This changes the remaining span for the cast, because the new `Cast` category has a higher priority (lower `Ord`) than the old `Coercion` category, so we no longer report the region error for the "unsizing" coercion from `*const Trait` to itself.

…leLapkin improve compile errors for invalid ptr-to-ptr casts with trait objects This is a follow-up to rust-lang#120248 to improve some of its error messages. 1. Make the borrowcheck error for "type annotation requires that x must outlive y" actually point at the type annotation, i.e. the type `T` in a `x as T` cast. This makes the error more consistent with other errors caused by type annotation in other places, such as ```text error: lifetime may not live long enough --> src/lib.rs:4:12 | 3 | fn bar(a: &i32) { | - let's call the lifetime of this reference `'1` 4 | let b: &'static i32 = a; | ^^^^^^^^^^^^ type annotation requires that `'1` must outlive `'static` ``` 2. Don't say "cast" when we actually mean "coercion" and give borrowcheck errors from actual casts (which is currently just the check added in rust-lang#120248) a higher priority than ones from coercions. This can improve the errors for ptr-to-ptr cast between trait objects because they are are lowered as an upcast "unsizing" coercion if possible (which may be the identity upcast) followed by the actual cast. 3. Bring back the old "casting X as Y is invalid" message for type mismatch in the principals and reword the "vtable kinds may not match" message to more accurately describe the pointer metadata and not refer to "vtables" if the metadata is unknown. fixes rust-lang#130030 r? `@WaffleLapkin` but feel free to reassign

…ouxu Improve assembly test for CMSE ABIs Tracking issues: rust-lang#75835 rust-lang#81391 This ensures the code-gen for these ABIs does not change silently. There is a small chance that this code-gen might change, however even GCC (https://godbolt.org/z/16arxab5x and https://godbolt.org/z/16arxab5x) generates almost the same assembly for these ABIs. I hope the notes in the comments should help fix the tests if it ever breaks.

Separate collection of crate-local inherent impls from error tracking rust-lang#119895 changed the return type of the `crate_inherent_impls` query from `CrateInherentImpls` to `Result<CrateInherentImpls, ErrorGuaranteed>` to avoid needing to use the non-parallel-friendly `track_errors()` to track if an error was reporting from within the query... This was mostly fine until rust-lang#121113, which stopped halting compilation when we hit an `Err(ErrorGuaranteed)` in the `crate_inherent_impls` query. Thus we proceed onwards to typeck, and since a return type of `Result<CrateInherentImpls, ErrorGuaranteed>` means that the query can *either* return one of "the list inherent impls" or "error has been reported", later on when we want to assemble method or associated item candidates for inherent impls, we were just treating any `Err(ErrorGuaranteed)` return value as if Rust had no inherent impls defined anywhere at all! This leads to basically every inherent method call failing with an error, lol, which was reported in rust-lang#127798. This PR changes the `crate_inherent_impls` query to return `(CrateInherentImpls, Result<(), ErrorGuaranteed>)`, i.e. returning the inherent impls collected *and* whether an error was reported in the query itself. It firewalls the latter part of that query into a new `crate_inherent_impls_validity_check` just for the `ensure()` call. This fixes rust-lang#127798.

…eb,Mark-Simulacrum Pin memchr to 2.5.0 in the library rather than rustc_ast The latest versions of `memchr` experience LTO-related issues when compiling for windows-gnu [1], so needs to be pinned. The issue is present in the standard library. `memchr` has been pinned in `rustc_ast`, but since the workspace was recently split, this pin no longer has any effect on library crates. Resolve this by adding `memchr` as an _unused_ dependency in `std`, pinned to 2.5. Additionally, remove the pin in `rustc_ast` to allow non-library crates to upgrade to the latest version. Link: rust-lang#127890 [1] try-job: x86_64-mingw try-job: x86_64-msvc

add InProgress ErrorKind gated behind io_error_inprogress feature Follow up on rust-lang/libs-team#92 (comment)

…r=matthiaskrgr Mention `COMPILETEST_VERBOSE_CRASHES` on crash test failure Fixes rust-lang#130776. r? `@matthiaskrgr` (or compiler/bootstrap)

rustdoc: inherit parent's stability where applicable It is currently not possible for a re-export to have a different stability (rust-lang#30827). Therefore the standard library uses a hack when moving items like `std::error::Error` or `std::net::IpAddr` into `core` by marking the containing module (`core::error` / `core::net`) as unstable or stable in a later version than the items the module contains. Previously, rustdoc would always show the *stability as declared* for an item rather than the *stability as publicly reachable* (i.e. the features required to actually access the item), which could be confusing when viewing the docs. This PR changes it so that we show the stability of the first unstable parent or the most recently stabilized parent instead, to hopefully make things less confusing. fixes rust-lang#130765 screenshots: ![error in std](https://github.com/user-attachments/assets/2ab9bdb9-ed81-4e45-a832-ac7d3ba1be3f) ![error in core](https://github.com/user-attachments/assets/46f46182-5642-4ac5-b92e-0b99a8e2496d)

tgross35 · 2024-09-24T23:48:04Z

@bors r+ rollup=never p=7

bors · 2024-09-24T23:48:06Z

📌 Commit 9737f92 has been approved by tgross35

It is now in the queue for this repository.

bors · 2024-09-25T02:07:00Z

⌛ Testing commit 9737f92 with merge 1b5aa96...

bors · 2024-09-25T04:53:45Z

☀️ Test successful - checks-actions
Approved by: tgross35
Pushing 1b5aa96 to master...

rust-timer · 2024-09-25T04:55:44Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#130234	improve compile errors for invalid ptr-to-ptr casts with tr…	`6d8a52dbfaf3506389e300163bcf296f95bb193a` (link)
#130752	Improve assembly test for CMSE ABIs	`e4c5d1baeaa5114c22096091729b3ceb6b08876e` (link)
#130764	Separate collection of crate-local inherent impls from erro…	`58192ecf7b0425707016e70108dd5dc0645780d1` (link)
#130788	Pin memchr to 2.5.0 in the library rather than rustc_ast	`b7dff2eb77a31fe38de8bbe25e6be64df2de67ac` (link)
#130789	add InProgress ErrorKind gated behind io_error_inprogress f…	`97b16dde22332b315c05e0eb6ad18bd9194b53f5` (link)
#130793	Mention `COMPILETEST_VERBOSE_CRASHES` on crash test failure	`239fcf66b84383f931167c1c12a14fe7ae13769d` (link)
#130798	rustdoc: inherit parent's stability where applicable	`7f0a4c99007eefe0ce8e8c2ef7a4c75065b1a3f5` (link)

previous master: 3f99982c63

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-09-25T06:12:04Z

Finished benchmarking commit (1b5aa96): 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.3%	[0.2%, 0.7%]	5
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.4%	[-0.4%, -0.4%]	1
Improvements ✅ (secondary)	-1.2%	[-2.3%, -0.2%]	2
All ❌✅ (primary)	0.2%	[-0.4%, 0.7%]	6

Max RSS (memory usage)

Results (primary 0.2%, secondary -2.2%)

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)	3.4%	[3.4%, 3.4%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-1.4%	[-2.2%, -0.5%]	2
Improvements ✅ (secondary)	-2.2%	[-2.2%, -2.2%]	1
All ❌✅ (primary)	0.2%	[-2.2%, 3.4%]	3

Cycles

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

Binary size

Results (primary -0.0%, secondary 0.0%)

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.2%	[0.2%, 0.3%]	5
Regressions ❌ (secondary)	0.0%	[0.0%, 0.1%]	14
Improvements ✅ (primary)	-0.2%	[-0.7%, -0.0%]	6
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.0%	[-0.7%, 0.3%]	11

Bootstrap: 767.733s -> 769.688s (0.25%)
Artifact size: 340.84 MiB -> 340.87 MiB (0.01%)

lukas-code · 2024-09-25T11:50:02Z

@rust-timer build 7f0a4c9

rust-timer · 2024-09-25T14:08:37Z

Finished benchmarking commit (7f0a4c9): comparison URL.

Overall result: ❌✅ regressions and improvements - 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.5%	[0.4%, 0.6%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.1%	[-2.1%, -2.1%]	1
All ❌✅ (primary)	0.5%	[0.4%, 0.6%]	2

Max RSS (memory usage)

Results (primary -2.8%, secondary -1.5%)

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)	-2.8%	[-2.8%, -2.8%]	1
Improvements ✅ (secondary)	-1.5%	[-1.5%, -1.5%]	1
All ❌✅ (primary)	-2.8%	[-2.8%, -2.8%]	1

Cycles

Results (primary 0.8%, secondary 2.0%)

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

Binary size

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

Bootstrap: 767.733s -> 768.621s (0.12%)
Artifact size: 340.84 MiB -> 340.79 MiB (-0.02%)

rustdoc perf: clone `clean::Item` less In rust-lang#130798, I caused a small perf regression for rustdoc (see rust-lang#130807 (comment)), so here is a small improvement to make up for it 😺. r? ghost

…iddle rustdoc perf: clone `clean::Item` less In rust-lang#130798, I caused a small perf regression for rustdoc (see rust-lang#130807 (comment)), so here is a small improvement to make up for it 😺. This change is actually unrelated to the minor perf regression in `Item::stability` and instead fixes a more relevant perf problem that I found while investigating: For certain crates with many impls on type aliases, we unnecessarily cloned large `clean::Item`s multiple times -- now we just borrow them.

Kobzol · 2024-10-01T07:25:33Z

The doc regressions were fixed (and in fact much improved) in #130857.

@rustbot label: +perf-regression-triaged

tdittr and others added 21 commits September 23, 2024 18:57

Improve assembly test for CMSE ABIs

3d168c2

This ensures the code-gen for these ABIs does not change silently. Co-authored-by: Folkert <[email protected]>

Separate collection of crate-local inherent impls from error reporting

cfb8419

Fix tools

28f6980

Mention COMPILETEST_VERBOSE_CRASHES on crash test failure

50729fe

add InProgress ErrorKind gated behind io_error_inprogress feature

46fd76e

Co-authored-by: David Tolnay <[email protected]> Co-authored-by: nora <[email protected]>

rustdoc: inherit parent's stability where applicable

2fdeb3b

unify dyn* coercions with other pointer coercions

46ecb23

add another test

b52dea8

use more accurate spans for user type ascriptions

d1e82d4

be even more precise about "cast" vs "coercion"

bd31e3e

improve errors for invalid pointer casts

39f66ba

update doc comment

b62e72c

Rollup merge of rust-lang#130789 - aviramha:add_inprogress, r=Noratrieb

147aa86

add InProgress ErrorKind gated behind io_error_inprogress feature Follow up on rust-lang/libs-team#92 (comment)

Rollup merge of rust-lang#130793 - jieyouxu:mention-crashes-verbose, …

7de1082

…r=matthiaskrgr Mention `COMPILETEST_VERBOSE_CRASHES` on crash test failure Fixes rust-lang#130776. r? `@matthiaskrgr` (or compiler/bootstrap)

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 Sep 24, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 25, 2024

bors merged commit 1b5aa96 into rust-lang:master Sep 25, 2024
7 checks passed

rustbot added this to the 1.83.0 milestone Sep 25, 2024

This was referenced Sep 25, 2024

Run cargo update in the project root #129624

Merged

Simple validation for unsize coercion in MIR validation #130735

Merged

rustbot added the perf-regression Performance regression. label Sep 25, 2024

This comment has been minimized.

Sign in to view

lukas-code mentioned this pull request Sep 25, 2024

rustdoc perf: clone clean::Item less #130857

Merged

rustbot added the perf-regression-triaged The performance regression has been triaged. label Oct 1, 2024

tgross35 deleted the rollup-p304vzf branch October 1, 2024 14:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #130807

Rollup of 7 pull requests #130807

tgross35 commented Sep 24, 2024

tgross35 commented Sep 24, 2024

bors commented Sep 24, 2024

bors commented Sep 25, 2024

bors commented Sep 25, 2024

rust-timer commented Sep 25, 2024

rust-timer commented Sep 25, 2024

lukas-code commented Sep 25, 2024

This comment has been minimized.

rust-timer commented Sep 25, 2024

Kobzol commented Oct 1, 2024

Rollup of 7 pull requests #130807

Rollup of 7 pull requests #130807

Conversation

tgross35 commented Sep 24, 2024

tgross35 commented Sep 24, 2024

bors commented Sep 24, 2024

bors commented Sep 25, 2024

bors commented Sep 25, 2024

rust-timer commented Sep 25, 2024

rust-timer commented Sep 25, 2024

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

lukas-code commented Sep 25, 2024

This comment has been minimized.

rust-timer commented Sep 25, 2024

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Kobzol commented Oct 1, 2024