Rollup of 7 pull requests #131458

matthiaskrgr · 2024-10-09T18:27:27Z

Successful merges:

Add "reference" as a known compiletest header #131382 (Add "reference" as a known compiletest header)
Dont ICE when encountering post-mono layout cycle error #131420 (Dont ICE when encountering post-mono layout cycle error)
compiler: Stop reexporting enum-globs from rustc_target::abi #131424 (compiler: Stop reexporting enum-globs from rustc_target::abi)
Fix quotation marks around debug line in src/ci/run.sh #131426 (Fix quotation marks around debug line in src/ci/run.sh)
Ignore broken-pipe-no-ice on apple (specifically macOS) for now #131435 (Ignore broken-pipe-no-ice on apple (specifically macOS) for now)
add more crash tests #131447 (add more crash tests)
Fix typo in E0793 #131456 (Fix typo in E0793)

r? @ghost
@rustbot modify labels: rollup

Without this change, the markdown-style backticks are treated as a shell command substitution, which fails like so: /checkout/src/ci/run.sh: line 58: DISABLE_CI_RUSTC_IF_INCOMPATIBLE: command not found debug: configured.

This adds the "reference" compiletest header so that the Rust reference can add annotations to the test suite in order to link tests to individual rules in the reference. Tooling in the reference repo will be responsible for collecting these annotations and linking to the tests. More details are in MCP 783: rust-lang/compiler-team#783

…youxu Add "reference" as a known compiletest header This adds the "reference" compiletest header so that the Rust reference can add annotations to the test suite in order to link tests to individual rules in the reference. Tooling in the reference repo will be responsible for collecting these annotations and linking to the tests. More details are in MCP 783: rust-lang/compiler-team#783 There is a change from the MCP in that I am not adding the JSON collection to compiletest (at least, not yet). In looking at this more closely, that actually makes things more difficult for our tooling, so I'm leaving it out for now. If in the future it looks like something we want, then I think we can add it later. There are a few tests here which need adjusting due to the legacy header check. `@jieyouxu` indicated on Zulip that we could potentially remove the legacy header check, in which case those changes can be dropped from this PR. r? `@jieyouxu`

…ycle, r=wesleywiser Dont ICE when encountering post-mono layout cycle error It's possible to encounter post-mono layout cycle errors in `fn_abi_of_instance`. Don't ICE in those cases. This was originally discovered in an async fn, but that's not the only way to encounter such an error (which the other test I added should demonstrate). Error messsages suck, but this fix is purely about suppressing the ICE. Fixes rust-lang#131409

…ob-imports, r=jieyouxu compiler: Stop reexporting enum-globs from `rustc_target::abi` Three enums had **all** their variants glob-exported into a distressingly large amount of the tree. Cease to do that, and also cease to glob import the contents of the module that contained them. Redirect relevant imports to their actual source, the `rustc_abi` crate. No functional changes.

Fix quotation marks around debug line in `src/ci/run.sh` Without this change, the markdown-style backticks are treated as a shell command substitution, which fails like so: /checkout/src/ci/run.sh: line 58: DISABLE_CI_RUSTC_IF_INCOMPATIBLE: command not found debug: configured. r? onur-ozkan

Ignore broken-pipe-no-ice on apple (specifically macOS) for now This test fails for me locally (initially reported by Zalathar) because apparently on macOS it doesn't say "internal compiler error" but it does report the std I/O panic, and it doesn't exit with a code of 101 but instead terminates with a wait signal of SIGPIPE. Ignore this test on apple for now, until we try to actually address the underlying issue. See rust-lang#131155 and rust-lang#131436 for more context.

…piler-errors add more crash tests r? `@jieyouxu`

Fix typo in E0793 `s/references/reference/`

matthiaskrgr · 2024-10-09T18:27:38Z

@bors r+ rollup=never p=7

bors · 2024-10-09T18:27:40Z

📌 Commit 0fe2532 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-10-09T18:40:57Z

⌛ Testing commit 0fe2532 with merge 2230114...

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#131382 (Add "reference" as a known compiletest header) - rust-lang#131420 (Dont ICE when encountering post-mono layout cycle error) - rust-lang#131424 (compiler: Stop reexporting enum-globs from `rustc_target::abi`) - rust-lang#131426 (Fix quotation marks around debug line in `src/ci/run.sh`) - rust-lang#131435 (Ignore broken-pipe-no-ice on apple (specifically macOS) for now) - rust-lang#131447 (add more crash tests) - rust-lang#131456 (Fix typo in E0793) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2024-10-09T19:43:40Z

The job x86_64-gnu-llvm-18 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

##[group]Building stage1 library artifacts (x86_64-unknown-linux-gnu)
##[endgroup]
##[group]Building tool rustdoc (stage0 -> stage1, x86_64-unknown-linux-gnu)
##[endgroup]
thread 'core::builder::tests::ci_rustc_if_unchanged_logic' panicked at src/core/builder/tests.rs:260:5:
assertion failed: has_changes == config.download_rustc_commit.is_none()
   0: rust_begin_unwind
             at /rustc/8c27a2ba6b21f3406a51118643080f0591949827/library/std/src/panicking.rs:662:5
   1: core::panicking::panic_fmt
             at /rustc/8c27a2ba6b21f3406a51118643080f0591949827/library/core/src/panicking.rs:74:14

bors · 2024-10-09T19:44:22Z

💔 Test failed - checks-actions

matthiaskrgr · 2024-10-09T19:59:04Z

@bors retry

bors · 2024-10-09T22:21:47Z

⌛ Testing commit 0fe2532 with merge fc0f045...

bors · 2024-10-10T01:11:03Z

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

rust-timer · 2024-10-10T01:13:02Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#131382	Add "reference" as a known compiletest header	`1fa51888be1c8f7e2b8467e1ac52a6cee5e16760` (link)
#131420	Dont ICE when encountering post-mono layout cycle error	`a4dec53a03fefe60e365c11833918c7272947fad` (link)
#131424	compiler: Stop reexporting enum-globs from `rustc_target::a…	`5569f31ffda196336096742c1fc0d043e7b2176d` (link)
#131426	Fix quotation marks around debug line in `src/ci/run.sh`	`67f56fb76535721b028bf0963ae353ddf475a982` (link)
#131435	Ignore broken-pipe-no-ice on apple (specifically macOS) for…	`505690eb69bf037410722e6a8c0a92a1e36ee256` (link)
#131447	add more crash tests	`dc6eeec31a97bf1b1196c53b924a913e17b86258` (link)
#131456	Fix typo in E0793	`c4d8f1a1a5c6f42158285bb1c91ff07787d9ca5d` (link)

previous master: eb4e234674

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-10T03:05:34Z

Finished benchmarking commit (fc0f045): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (primary -2.4%, secondary -2.1%)

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.4%	[-2.4%, -2.4%]	1
Improvements ✅ (secondary)	-2.1%	[-2.1%, -2.1%]	1
All ❌✅ (primary)	-2.4%	[-2.4%, -2.4%]	1

Cycles

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)	2.6%	[2.2%, 3.1%]	5
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.1%	[-2.2%, -1.9%]	2
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 775.436s -> 775.903s (0.06%)
Artifact size: 329.69 MiB -> 329.71 MiB (0.00%)

compiler-errors and others added 22 commits October 8, 2024 16:46

Dont ICE when encountering post-mono layout cycle error

17eca60

compiler: Factor rustc_target::abi::* out of middle::ty::layout

8da92b5

compiler: Factor rustc_target::abi::* out of ty_utils

11c48be

compiler: Factor rustc_target::abi out of const_eval

9d95c8b

compiler: Factor rustc_target::abi out of hir_typeck

ff17ce2

compiler: Factor rustc_target::abi out of cg_ssa

839cf1c

compiler: Factor rustc_target::abi out of cg_llvm

1379ef5

cg_clif: Factor out rustc_target::abi

b3beb4e

cg_gcc: Factor out rustc_target::abi

d92aee5

compiler: Seal off the rustc_target::abi enum glob imports

43e198a

Fix quotation marks around debug line in src/ci/run.sh

af5a704

Without this change, the markdown-style backticks are treated as a shell command substitution, which fails like so: /checkout/src/ci/run.sh: line 58: DISABLE_CI_RUSTC_IF_INCOMPATIBLE: command not found debug: configured.

Ignore broken-pipe-no-ice on apple for now

fe87487

add more crash tests

6774856

Fix typo in E0793

12ce6f6

Rollup merge of rust-lang#131447 - matthiaskrgr:morecrashtests, r=com…

55b4ee7

…piler-errors add more crash tests r? `@jieyouxu`

Rollup merge of rust-lang#131456 - kupiakos:patch-3, r=compiler-errors

0fe2532

Fix typo in E0793 `s/references/reference/`

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 9, 2024

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

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 9, 2024

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

bors merged commit fc0f045 into rust-lang:master Oct 10, 2024
7 checks passed

rustbot added this to the 1.83.0 milestone Oct 10, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #131458

Rollup of 7 pull requests #131458

matthiaskrgr commented Oct 9, 2024

matthiaskrgr commented Oct 9, 2024

bors commented Oct 9, 2024

bors commented Oct 9, 2024

rust-log-analyzer commented Oct 9, 2024

bors commented Oct 9, 2024

matthiaskrgr commented Oct 9, 2024

bors commented Oct 9, 2024

bors commented Oct 10, 2024

rust-timer commented Oct 10, 2024

rust-timer commented Oct 10, 2024

Rollup of 7 pull requests #131458

Rollup of 7 pull requests #131458

Conversation

matthiaskrgr commented Oct 9, 2024

matthiaskrgr commented Oct 9, 2024

bors commented Oct 9, 2024

bors commented Oct 9, 2024

rust-log-analyzer commented Oct 9, 2024

bors commented Oct 9, 2024

matthiaskrgr commented Oct 9, 2024

bors commented Oct 9, 2024

bors commented Oct 10, 2024

rust-timer commented Oct 10, 2024

rust-timer commented Oct 10, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size