Rollup of 7 pull requests #124040

GuillaumeGomez · 2024-04-16T22:00:26Z

Successful merges:

Don't ICE for kind mismatches during error rendering #123673 (Don't ICE for kind mismatches during error rendering)
Taint const qualifs if a static is referenced that didn't pass wfcheck #123675 (Taint const qualifs if a static is referenced that didn't pass wfcheck)
Port the 2 rust-lld run-make tests to rmake #123975 (Port the 2 rust-lld run-make tests to rmake)
Use /* value */ as a placeholder #124000 (Use /* value */ as a placeholder)
Box::into_raw: make Miri understand that this is a box-to-raw cast #124013 (Box::into_raw: make Miri understand that this is a box-to-raw cast)
Prefer identity equality over equating types during coercion. #124027 (Prefer identity equality over equating types during coercion.)
Remove default_hidden_visibility: false from wasm targets #124036 (Remove default_hidden_visibility: false from wasm targets)

r? @ghost
@rustbot modify labels: rollup

note: version more recent than 1.8 depend on memchr 2.6, which creates conflicts as memchr 2.5.0 is pinned elsewhere in the workspace

also check that turning off the linker feature does not use lld

also make sure that rust-lld can be disabled via linker features, even when enabled by default by the target spec

and use it in the `rust-lld` tests

If you want to override an env var, don't unset it, just set it

These types are always generic only over their own generic parameters with no inference variables involved.

To the best of my ability I believe that this is no longer necessary. I don't fully recall why this was first added but I believe it had to do with symbols all being exported by default and this was required to undo that. Regardless nowadays the default output of rustc seems suitable so it seems best to keep wasm in line with other targets.

…u,estebank Don't ICE for kind mismatches during error rendering fixes rust-lang#123457 also some test suite cleanups to make backtraces easier to read

…errors Taint const qualifs if a static is referenced that didn't pass wfcheck It is correct to only check the signature here, as the ICE is caused by `USE_WITH_ERROR` trying to allocate memory to store the result of `WITH_ERROR` before evaluating it. fixes rust-lang#123153

Port the 2 `rust-lld` run-make tests to `rmake` In preparation for finalizing most of the `rust-lld` work, this PR ports the following tests to `rmake`: - `tests/run-make/rust-lld` - `tests/run-make/rust-lld-custom-target` As they use `$(CGREP) -e` I added `regex` as an exported dependency to the `run_make_support` library. Unfortunately, the most recent versions depend on `memchr` 2.6.0 but it's currently pinned at 2.5.0 in the workspace, and therefore had to settle for the older `regex-1.8.0`. r? `@jieyouxu`

…leywiser Use `/* value */` as a placeholder The expression `value` isn't a valid suggestion; let's use `/* value */` as a placeholder (which is also invalid) since it more clearly signals to the user that they need to fill it in with something meaningful. This parallels the suggestions we have in a couple other places, like arguments. We could also print the type name instead of `/* value */`, especially if it's suggestable, but I don't care strongly about that.

Box::into_raw: make Miri understand that this is a box-to-raw cast Turns out rust-lang#122647 went a bit too far in cleaning up `Box`... we still need a hack in `Box::into_raw`. The nicer fix would be to make Stacked Borrows not care about reference-to-raw-pointer casts, but it's unclear whether that will ever be possible without going to full Tree Borrows. Fixes rust-lang/miri#3473.

…mpiler-errors Prefer identity equality over equating types during coercion. These types are always generic only over their own generic parameters with no inference variables involved. r? `@compiler-errors` I love touching code that [hasn't changed meaningfully since 2016](rust-lang#41937)

…ility, r=jieyouxu Remove `default_hidden_visibility: false` from wasm targets To the best of my ability I believe that this is no longer necessary. I don't fully recall why this was first added but I believe it had to do with symbols all being exported by default and this was required to undo that. Regardless nowadays the default output of rustc seems suitable so it seems best to keep wasm in line with other targets.

rustbot · 2024-04-16T22:00:28Z

Could not assign reviewer from: ghost.
User(s) ghost are either the PR author, already assigned, or on vacation. If it's a team, we could not find any candidates.
Please use r? to specify someone else to assign.

rustbot · 2024-04-16T22:00:32Z

@GuillaumeGomez: no appropriate reviewer found, use r? to override

GuillaumeGomez · 2024-04-16T22:00:35Z

@bors r+ p=5 rollup=never

bors · 2024-04-16T22:00:38Z

📌 Commit a0ca118 has been approved by GuillaumeGomez

It is now in the queue for this repository.

jackh726 · 2024-04-16T22:17:55Z

testing triagebot

r? ghost

rustbot · 2024-04-16T22:17:58Z

Failed to set assignee to ghost: invalid assignee

Note: Only org members with at least the repository "read" role, users with write permissions, or people who have commented on the PR may be assigned.

jackh726 · 2024-04-16T22:18:26Z

again

r? @ghost

rustbot · 2024-04-16T22:18:30Z

Failed to set assignee to ghost: invalid assignee

Note: Only org members with at least the repository "read" role, users with write permissions, or people who have commented on the PR may be assigned.

bors · 2024-04-17T00:04:44Z

⌛ Testing commit a0ca118 with merge 7e3ba5b...

bors · 2024-04-17T02:05:38Z

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 7e3ba5b to master...

rust-timer · 2024-04-17T02:07:36Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#123673	Don't ICE for kind mismatches during error rendering	`2d9c5e8e5212478012908bb1ff2b6c1302026c0e` (link)
#123675	Taint const qualifs if a static is referenced that didn't p…	`5d6c730fe8f99b30bb88ec8820d3c62e61b195f0` (link)
#123975	Port the 2 `rust-lld` run-make tests to `rmake`	`69adca9906e315c340ab1b2a33fe50601cc19fe0` (link)
#124000	Use `/* value */` as a placeholder	`6543ced94881016ecba75133737163a860972491` (link)
#124013	Box::into_raw: make Miri understand that this is a box-to-r…	`4b7a5f0b0216b8767de0281fbba80db579bfe05e` (link)
#124027	Prefer identity equality over equating types during coercio…	`d298c3f5cb00887c6f94e6b84a8d11f80334df5d` (link)
#124036	Remove `default_hidden_visibility: false` from wasm targets	`a96b14e8490775c50c213dbb16e6fa2033c8a8c9` (link)

previous master: 3fba278231

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-04-17T03:21:51Z

Finished benchmarking commit (7e3ba5b): 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

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)	-4.3%	[-6.3%, -2.3%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-4.3%	[-6.3%, -2.3%]	2

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)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.2%	[-6.5%, -2.8%]	17
All ❌✅ (primary)	-	-	0

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

Bootstrap: 676.389s -> 677.09s (0.10%)
Artifact size: 316.13 MiB -> 316.06 MiB (-0.02%)

lqd and others added 22 commits April 15, 2024 17:23

add missing lld directive to compiletest

96e7d25

add regex to run_make_support

682535e

note: version more recent than 1.8 depend on memchr 2.6, which creates conflicts as memchr 2.5.0 is pinned elsewhere in the workspace

port rust-lld test to rmake

9779592

also check that turning off the linker feature does not use lld

port rust-lld-custom-target test to rmake

8fa6984

also make sure that rust-lld can be disabled via linker features, even when enabled by default by the target spec

add link_arg helper to run_make_support

8acfe9a

and use it in the `rust-lld` tests

mention json target specs in run_make_support

af887d3

Use /* value */ as a placeholder

8a981b6

Make array suggestions slightly more accurate

c957613

Taint const qualifs if a static is referenced that didn't pass wfcheck

801413e

Unset test env vars before setting new ones.

fe18afe

If you want to override an env var, don't unset it, just set it

Make ui_test backtraces short by default

4f75d67

Don't ICE for kind mismatches during error rendering

0a88339

Box::into_raw: make Miri understand that this is a box-to-raw cast

8606efa

Prefer identity equality over equating types during coercion.

9cc4e23

These types are always generic only over their own generic parameters with no inference variables involved.

Rollup merge of rust-lang#123673 - oli-obk:sig_wfcheck_ice, r=jieyoux…

4aaa8f9

…u,estebank Don't ICE for kind mismatches during error rendering fixes rust-lang#123457 also some test suite cleanups to make backtraces easier to read

rustbot added the rollup A PR which is a rollup label Apr 16, 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 Apr 16, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 17, 2024

bors merged commit 7e3ba5b into rust-lang:master Apr 17, 2024
13 checks passed

rustbot added this to the 1.79.0 milestone Apr 17, 2024

bors mentioned this pull request Apr 17, 2024

More DefineOpaqueTypes::Yes #123794

Merged

GuillaumeGomez deleted the rollup-hrrvsgh branch April 17, 2024 09:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #124040

Rollup of 7 pull requests #124040

GuillaumeGomez commented Apr 16, 2024

rustbot commented Apr 16, 2024

rustbot commented Apr 16, 2024

GuillaumeGomez commented Apr 16, 2024

bors commented Apr 16, 2024

jackh726 commented Apr 16, 2024

rustbot commented Apr 16, 2024

jackh726 commented Apr 16, 2024

rustbot commented Apr 16, 2024

bors commented Apr 17, 2024

bors commented Apr 17, 2024

rust-timer commented Apr 17, 2024

rust-timer commented Apr 17, 2024

Rollup of 7 pull requests #124040

Rollup of 7 pull requests #124040

Conversation

GuillaumeGomez commented Apr 16, 2024

rustbot commented Apr 16, 2024

rustbot commented Apr 16, 2024

GuillaumeGomez commented Apr 16, 2024

bors commented Apr 16, 2024

jackh726 commented Apr 16, 2024

rustbot commented Apr 16, 2024

jackh726 commented Apr 16, 2024

rustbot commented Apr 16, 2024

bors commented Apr 17, 2024

bors commented Apr 17, 2024

rust-timer commented Apr 17, 2024

rust-timer commented Apr 17, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size