Rollup of 6 pull requests #100611

matthiaskrgr · 2022-08-16T04:06:01Z

Successful merges:

when there are 3 or more return statements in the loop #100338 (when there are 3 or more return statements in the loop)
Add support for generating unique profraw files by default when using -C instrument-coverage #100384 (Add support for generating unique profraw files by default when using -C instrument-coverage)
Update the minimum external LLVM to 13 #100460 (Update the minimum external LLVM to 13)
Add missing closing quote #100567 (Add missing closing quote)
Suggest adding an array length if possible #100590 (Suggest adding an array length if possible)
Rename Machine memory hooks to suggest when they run #100600 (Rename Machine memory hooks to suggest when they run)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

…ng the `-C instrument-coverage` flag. Respond to PR comments.

emit the first 3 errors and duplicated diagnostic information using take of iterator for the first third return modified: compiler/rustc_typeck/src/check/coercion.rs new file: src/test/ui/typeck/issue-100285.rs new file: src/test/ui/typeck/issue-100285.stderr

…rochenkov when there are 3 or more return statements in the loop emit the first 3 errors and duplicated diagnostic information modified: compiler/rustc_typeck/src/check/coercion.rs new file: src/test/ui/typeck/issue-100285.rs new file: src/test/ui/typeck/issue-100285.stderr

…ut, r=wesleywiser Add support for generating unique profraw files by default when using `-C instrument-coverage` Currently, enabling the rustc flag `-C instrument-coverage` instruments the given crate and by default uses the naming scheme `default.profraw` for any instrumented profile files generated during the execution of a binary linked against this crate. This leads to multiple binaries being executed overwriting one another and causing only the last executable run to contain actual coverage results. This can be overridden by manually setting the environment variable `LLVM_PROFILE_FILE` to use a unique naming scheme. This PR adds a change to add support for a reasonable default for rustc to use when enabling coverage instrumentation similar to how the Rust compiler treats generating these same `profraw` files when PGO is enabled. The new naming scheme is set to `default_%m_%p.profraw` to ensure the uniqueness of each file being generated using [LLVMs special pattern strings](https://clang.llvm.org/docs/SourceBasedCodeCoverage.html#running-the-instrumented-program). Today the compiler sets the default for PGO `profraw` files to `default_%m.profraw` to ensure a unique file for each run. The same can be done for the instrumented profile files generated via the `-C instrument-coverage` flag as well which LLVM has API support for. Linked Issue: rust-lang#100381 r? `@wesleywiser`

Update the minimum external LLVM to 13 With this change, we'll have stable support for LLVM 13 through 15 (pending release). For reference, the previous increase to LLVM 12 was rust-lang#90175. r? `@nagisa`

Add missing closing quote fixes rust-lang#100563

…h, r=compiler-errors Suggest adding an array length if possible fixes rust-lang#100448

…lfJung Rename Machine memory hooks to suggest when they run Some of the other memory hooks start with `before_` or `after_` to indicate that they run before or after a certain operation. These don't, so I was a bit confused as to when they are supposed to run. `memory_read` can be read two ways in English, "memory was read" or "this is a memory read" so without the prefix this was especially ambiguous.

matthiaskrgr · 2022-08-16T04:06:23Z

@bors r+ rollup=never p=6

bors · 2022-08-16T04:06:24Z

📌 Commit 88af506 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2022-08-16T05:13:42Z

⌛ Testing commit 88af506 with merge 8556e66...

bors · 2022-08-16T07:54:16Z

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

rust-highfive · 2022-08-16T07:54:45Z

📣 Toolstate changed by #100611!

Tested on commit 8556e66.
Direct link to PR: #100611

💔 miri on windows: test-pass → build-fail (cc @oli-obk @RalfJung).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @RalfJung).

@oli-obk

Tested on commit rust-lang/rust@8556e66. Direct link to PR: <rust-lang/rust#100611> 💔 miri on windows: test-pass → build-fail (cc @oli-obk @RalfJung). 💔 miri on linux: test-pass → build-fail (cc @oli-obk @RalfJung).

rust-timer · 2022-08-16T07:56:01Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#100600	48f170bec56ceba55c339a6da9b2440f84f3fcdc
#100590	b5797b679653366ae3c01c9d86d1187fe98e30b4
#100567	1d62153d13e31fa3bf9f7b80687b1241210187f3
#100460	7ae02cf010d4a1e97b1b49d20c2908ba48797a42
#100384	c16933dd34d3e67cfeb0cc3d04ca153ce6008cc6
#100338	3fc06e22cf6d49a7ea0dd9c788ebc6355f9af327

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 · 2022-08-16T09:09:49Z

Finished benchmarking commit (8556e66): comparison url.

Instruction count

Primary benchmarks: ❌ relevant regression found
Secondary benchmarks: ❌ relevant regressions found

( )	mean¹	max	count²
Regressions ❌ (primary)	0.2%	0.2%	1
Regressions ❌ (secondary)	0.3%	0.4%	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.2%	0.2%	1

Max RSS (memory usage)

Results

Primary benchmarks: no relevant changes found
Secondary benchmarks: mixed results

( )	mean¹	max	count²
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	3.1%	3.1%	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.6%	-2.6%	1
All ❌✅ (primary)	-	-	0

Cycles

Results

Primary benchmarks: ❌ relevant regressions found
Secondary benchmarks: ✅ relevant improvement found

( )	mean¹	max	count²
Regressions ❌ (primary)	2.4%	2.8%	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.2%	-2.2%	1
All ❌✅ (primary)	2.4%	2.8%	2

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

the arithmetic mean of the percent change ↩ ↩² ↩³
number of relevant changes ↩ ↩² ↩³

Remove backwards compat for LLVM 12 coverage format The minimum external LLVM was updated to 13 recently in rust-lang#100611, so this PR removes backwards compat with older coverage formats. I kept the version check and error message there, in accordance with this comment: rust-lang#91207 (comment)

ridwanabdillahi and others added 15 commits August 11, 2022 16:04

Add support for generating unique *.profraw files by default when usi…

1008822

…ng the `-C instrument-coverage` flag. Respond to PR comments.

Respond to RFC comments.

804579c

Respond to PR comments. Cleanup documentation.

7e49c1b

Update the minimum external LLVM to 13

2970ad8

Add missing closing quote

ba2c2a6

fixes rust-lang#100563

suggest adding an array length if possible

4d1b5f0

use span_suggestion instead of span_suggestion_verbose

12e609b

Rename Machine memory hooks to suggest when they run

a5cc3a0

Rollup merge of rust-lang#100460 - cuviper:drop-llvm-12, r=nagisa

0b19a18

Update the minimum external LLVM to 13 With this change, we'll have stable support for LLVM 13 through 15 (pending release). For reference, the previous increase to LLVM 12 was rust-lang#90175. r? `@nagisa`

Rollup merge of rust-lang#100567 - Rageking8:fix-100563, r=wesleywiser

fc735b0

Add missing closing quote fixes rust-lang#100563

Rollup merge of rust-lang#100590 - TaKO8Ki:suggest-adding-array-lengt…

76dd166

…h, r=compiler-errors Suggest adding an array length if possible fixes rust-lang#100448

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 16, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 16, 2022

bors merged commit 8556e66 into rust-lang:master Aug 16, 2022

rustbot added this to the 1.65.0 milestone Aug 16, 2022

rust-highfive mentioned this pull request Aug 16, 2022

miri no longer builds after rust-lang/rust#100611 #100614

Closed

bors mentioned this pull request Aug 16, 2022

Download, rather than sccache-cache, LLVM in CI #99967

Merged

matthiaskrgr deleted the rollup-rxj10ur branch October 9, 2022 00:31

Swatinem mentioned this pull request Jan 9, 2023

Remove backwards compat for LLVM 12 coverage format #106625

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #100611

Rollup of 6 pull requests #100611

matthiaskrgr commented Aug 16, 2022

matthiaskrgr commented Aug 16, 2022

bors commented Aug 16, 2022

bors commented Aug 16, 2022

bors commented Aug 16, 2022

rust-highfive commented Aug 16, 2022

rust-timer commented Aug 16, 2022

rust-timer commented Aug 16, 2022

Rollup of 6 pull requests #100611

Rollup of 6 pull requests #100611

Conversation

matthiaskrgr commented Aug 16, 2022

matthiaskrgr commented Aug 16, 2022

bors commented Aug 16, 2022

bors commented Aug 16, 2022

bors commented Aug 16, 2022

rust-highfive commented Aug 16, 2022

rust-timer commented Aug 16, 2022

rust-timer commented Aug 16, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes