Rollup of 7 pull requests #117180

matthiaskrgr · 2023-10-25T17:51:17Z

Successful merges:

Remove support for alias -Z instrument-coverage #117111 (Remove support for alias -Z instrument-coverage)
Require target features to match exactly during inlining #117141 (Require target features to match exactly during inlining)
Fix unwrap suggestion for async fn #117152 (Fix unwrap suggestion for async fn)
implement C ABI lowering for CSKY #117154 (implement C ABI lowering for CSKY)
Work around the fact that check_mod_type_wf may spuriously return ErrorGuaranteed #117159 (Work around the fact that check_mod_type_wf may spuriously return ErrorGuaranteed)
compiletest: Display compilation errors in mir-opt tests #117163 (compiletest: Display compilation errors in mir-opt tests)
Make Iterator a lang item #117173 (Make Iterator a lang item)

r? @ghost
@rustbot modify labels: rollup

In general it is not correct to inline a callee with a target features that are subset of the callee. Require target features to match exactly during inlining. The exact match could be potentially relaxed, but this would require identifying specific feature that are allowed to differ, those that need to match, and those that can be present in caller but not in callee. This resolves MIR part of rust-lang#116573. For other concerns with respect to the previous implementation also see areInlineCompatible in LLVM.

This flag was stabilized in rustc 1.60.0 as `-C instrument-coverage`, but the old unstable flag was kept around as an alias to ease migration.

…ErrorGuaranteed`, even if that error is only emitted by `check_modwitem_types`

…rrors Remove support for alias `-Z instrument-coverage` This flag was stabilized in rustc 1.60.0 (2022-04-07) as `-C instrument-coverage`, but the old unstable flag was kept around (with a warning) as an alias to ease migration. It should now be reasonable to remove the somewhat tricky code that implemented that alias. Fixes rust-lang#116980.

…oli-obk Require target features to match exactly during inlining In general it is not correct to inline a callee with a target features that are subset of the callee. Require target features to match exactly during inlining. The exact match could be potentially relaxed, but this would require identifying specific feature that are allowed to differ, those that need to match, and those that can be present in caller but not in callee. This resolves MIR part of rust-lang#116573. For other concerns with respect to the previous implementation also see areInlineCompatible in LLVM.

…=chenyukang Fix unwrap suggestion for async fn Use `body_fn_sig` to get the expected return type of the function instead of `ret_coercion` in `FnCtxt`. This avoids accessing the `ret_coercion` when it's already mutably borrowed (e.g. when checking `return` expressions). Fixes rust-lang#117144 r? `@chenyukang`

…2, r=bjorn3 implement C ABI lowering for CSKY fix rust-lang/compiler-builtins#551 Reference: [CSKY ABI Manual](https://occ-oss-prod.oss-cn-hangzhou.aliyuncs.com/resource//1695027452256/T-HEAD_800_Series_ABI_Standards_Manual.pdf) Reference: [Clang CSKY lowering code](https://github.com/llvm/llvm-project/blob/4a074f32a6914f2a8d7215d78758c24942dddc3d/clang/lib/CodeGen/Targets/CSKY.cpp#L76-L162) r? `@bjorn3`

Work around the fact that `check_mod_type_wf` may spuriously return `ErrorGuaranteed` Even if that error is only emitted by `check_mod_item_types`. fixes rust-lang#117153 A cleaner refactoring would merge/chain these queries in ways that ensure we only actually get an `ErrorGuaranteed` if there was an error emitted.

…piler-errors compiletest: Display compilation errors in mir-opt tests Previously when compilation failed the `check_mir_dump` would panic first, so we would never display the compiler output.

…errors Make `Iterator` a lang item r? `@compiler-errors` pulled out of rust-lang#116447 We're doing this change on its own, because iterator was the one diagnostic item that was load bearing on us correctly emitting errors about `diagnostic_item` mis-uses. It was used in some diagnostics as an early abort, before the actual checks of the diagnostic, so effectively the compiler was *unconditionally* checking for the iterator diagnostic item, even if it didn't emit any diagnostics. Changing those uses to use the lang item, caused us not to invoke the `all_diagnostic_items` query anymore, which then caused us to miss some issues around diagnostic items until they were actually used. The reason we keep the diagnostic item around is that clippy uses it a lot and having `Iterator` be a lang item and a diagnostic item at the same time doesn't cost us anything, but makes clippy's internal code simpler

matthiaskrgr · 2023-10-25T17:51:31Z

@bors r+ rollup=never p=7

bors · 2023-10-25T17:51:33Z

📌 Commit b0521fe has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-25T19:30:02Z

⌛ Testing commit b0521fe with merge ab5c841...

bors · 2023-10-25T21:21:47Z

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

rust-timer · 2023-10-25T21:23:48Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#117111	Remove support for alias `-Z instrument-coverage`	`a98c7df6c347147fa403ddedae69084b323cedcb` (link)
#117141	Require target features to match exactly during inlining	`1a69ffe163e4d7ce33ed5c067a877ed5ca56c439` (link)
#117152	Fix unwrap suggestion for async fn	`193dd2f82980fc586685bb8def22fbf82945dcde` (link)
#117154	implement C ABI lowering for CSKY	`d7edb0ef5104f5e60cd785b5f802ffdc8f0a74f2` (link)
#117159	Work around the fact that `check_mod_type_wf` may spuriousl…	`dc8cfe13cc0d7e7d320f9be78932717fe80846a8` (link)
#117163	compiletest: Display compilation errors in mir-opt tests	`3c6ebf2151542478953216cd1ae67804e9ae1404` (link)
#117173	Make `Iterator` a lang item	`6bd6a53333ae89caff8d9c02fa868bf204fc7349` (link)

previous master: cf226e93dc

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 · 2023-10-25T22:55:11Z

Finished benchmarking commit (ab5c841): 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)	3.7%	[3.7%, 3.7%]	1
Regressions ❌ (secondary)	0.2%	[0.2%, 0.2%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.3%	[-1.3%, -1.3%]	1
All ❌✅ (primary)	3.7%	[3.7%, 3.7%]	1

Max RSS (memory usage)

Results

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.4%	[2.3%, 5.4%]	3
Improvements ✅ (primary)	-3.3%	[-6.2%, -1.4%]	3
Improvements ✅ (secondary)	-1.9%	[-3.2%, -1.0%]	6
All ❌✅ (primary)	-3.3%	[-6.2%, -1.4%]	3

Cycles

Results

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.9%	[3.9%, 3.9%]	1
Regressions ❌ (secondary)	2.4%	[2.4%, 2.5%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	3.9%	[3.9%, 3.9%]	1

Binary size

Results

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.1%	[0.0%, 0.1%]	10
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.1%	[-0.5%, -0.0%]	11
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.0%	[-0.5%, 0.1%]	21

Bootstrap: missing data
Artifact size: 304.44 MiB -> 304.44 MiB (0.00%)

tmiasko and others added 17 commits October 24, 2023 22:19

Migrate inline_compatibility.rs test to FileCheck

ff7bf79

Precommit target features compatibility test

b3cfd5b

coverage: UI test for unstable value -C instrument-coverage=branch

bc18509

Remove support for alias -Z instrument-coverage

65b0f6a

This flag was stabilized in rustc 1.60.0 as `-C instrument-coverage`, but the old unstable flag was kept around as an alias to ease migration.

Fix unwrap suggestion for async fn

2334143

Work around the fact that check_mod_type_wf may spuriously return `…

beaf46f

…ErrorGuaranteed`, even if that error is only emitted by `check_modwitem_types`

implement C ABI lowering for CSKY

32339f8

compiletest: Display compilation errors in mir-opt tests

a9fad1c

Make Iterator a lang item

268ec72

Rollup merge of rust-lang#117163 - tmiasko:compiletest-mir-opt, r=com…

beba522

…piler-errors compiletest: Display compilation errors in mir-opt tests Previously when compilation failed the `check_mir_dump` would panic first, so we would never display the compiler output.

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 25, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 25, 2023

bors merged commit ab5c841 into rust-lang:master Oct 25, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Oct 25, 2023

bors mentioned this pull request Oct 25, 2023

doc(notable_trait) for impls #94904

Open

This was referenced Oct 25, 2023

Implement gen blocks in the 2024 edition #116447

Merged

Add FileCheck annotations to MIR-opt inlining tests #117029

Merged

rustbot added the perf-regression Performance regression. label Oct 25, 2023

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

matthiaskrgr deleted the rollup-rxhl6ep branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #117180

Rollup of 7 pull requests #117180

matthiaskrgr commented Oct 25, 2023

matthiaskrgr commented Oct 25, 2023

bors commented Oct 25, 2023

bors commented Oct 25, 2023

bors commented Oct 25, 2023

rust-timer commented Oct 25, 2023

rust-timer commented Oct 25, 2023

Rollup of 7 pull requests #117180

Rollup of 7 pull requests #117180

Conversation

matthiaskrgr commented Oct 25, 2023

matthiaskrgr commented Oct 25, 2023

bors commented Oct 25, 2023

bors commented Oct 25, 2023

bors commented Oct 25, 2023

rust-timer commented Oct 25, 2023

rust-timer commented Oct 25, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Binary size