Rollup of 6 pull requests #123576

matthiaskrgr · 2024-04-06T22:51:28Z

Successful merges:

Drop panic hook after running tests #119224 (Drop panic hook after running tests)
Put checks that detect UB under their own flag below debug_assertions #123411 (Put checks that detect UB under their own flag below debug_assertions)
Do not ICE on field access check on expr with ty::Error #123516 (Do not ICE on field access check on expr with ty::Error)
Stabilize const Atomic*::into_inner #123522 (Stabilize const Atomic*::into_inner)
Add a debug asserts call to match_projection_projections to ensure invariant #123559 (Add a debug asserts call to match_projection_projections to ensure invariant)
Rewrite version test run-make as an UI test #123563 (Rewrite version test run-make as an UI test)

Failed merges:

Move some tests #123569 (Move some tests)

r? @ghost
@rustbot modify labels: rollup

Previously we left the panic hook we allocated on main termination. Doing so makes Valgrind report it as a reachable unfreed block. In order to fix that use `panic::take_hook()` before examining test results. Example backtrace: ``` ==146594== 16 bytes in 1 blocks are still reachable in loss record 1 of 1 ==146594== at 0x4A390C5: malloc (vg_replace_malloc.c:442) ==146594== by 0x151336: alloc (alloc.rs:98) ==146594== by 0x151336: alloc_impl (alloc.rs:181) ==146594== by 0x151336: allocate (alloc.rs:241) ==146594== by 0x151336: exchange_malloc (alloc.rs:330) ==146594== by 0x151336: new<test::test_main::{closure_env#0}> (boxed.rs:217) ==146594== by 0x151336: test::test_main (lib.rs:124) ==146594== by 0x1522F9: test::test_main_static (lib.rs:160) ==146594== by 0x11E102: reachable_block_with_cargo_test::main (lib.rs:1) ==146594== by 0x11EABA: core::ops::function::FnOnce::call_once (function.rs:250) ==146594== by 0x11E76D: std::sys_common::backtrace::__rust_begin_short_backtrace (backtrace.rs:154) ==146594== by 0x11DFC0: std::rt::lang_start::{{closure}} (rt.rs:166) ==146594== by 0x177D3A: call_once<(), (dyn core::ops::function::Fn<(), Output=i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe)> (function.rs:284) ==146594== by 0x177D3A: do_call<&(dyn core::ops::function::Fn<(), Output=i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe), i32> (panicking.rs:504) ==146594== by 0x177D3A: try<i32, &(dyn core::ops::function::Fn<(), Output=i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe)> (panicking.rs:468) ==146594== by 0x177D3A: catch_unwind<&(dyn core::ops::function::Fn<(), Output=i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe), i32> (panic.rs:142) ==146594== by 0x177D3A: {closure#2} (rt.rs:148) ==146594== by 0x177D3A: do_call<std::rt::lang_start_internal::{closure_env#2}, isize> (panicking.rs:504) ==146594== by 0x177D3A: try<isize, std::rt::lang_start_internal::{closure_env#2}> (panicking.rs:468) ==146594== by 0x177D3A: catch_unwind<std::rt::lang_start_internal::{closure_env#2}, isize> (panic.rs:142) ==146594== by 0x177D3A: std::rt::lang_start_internal (rt.rs:148) ==146594== by 0x11DF99: std::rt::lang_start (rt.rs:165) ``` Signed-off-by: Tal Gelbard <[email protected]>

Fix rust-lang#123428

…variant

fix: re-add stout ignore restore does-nothing fix: universal check-pass

…, r=cuviper Drop panic hook after running tests Issue: rust-lang#119223 Previously we left the panic hook we allocated on main termination. Doing so makes Valgrind report it as a reachable unfreed block. In order to fix that use `panic::take_hook()` before examining test results. Example backtrace: ``` ==146594== 16 bytes in 1 blocks are still reachable in loss record 1 of 1 ==146594== at 0x4A390C5: malloc (vg_replace_malloc.c:442) ==146594== by 0x151336: alloc (alloc.rs:98) ==146594== by 0x151336: alloc_impl (alloc.rs:181) ==146594== by 0x151336: allocate (alloc.rs:241) ==146594== by 0x151336: exchange_malloc (alloc.rs:330) ==146594== by 0x151336: new<test::test_main::{closure_env#0}> (boxed.rs:217) ==146594== by 0x151336: test::test_main (lib.rs:124) ==146594== by 0x1522F9: test::test_main_static (lib.rs:160) ==146594== by 0x11E102: reachable_block_with_cargo_test::main (lib.rs:1) ==146594== by 0x11EABA: core::ops::function::FnOnce::call_once (function.rs:250) ==146594== by 0x11E76D: std::sys_common::backtrace::__rust_begin_short_backtrace (backtrace.rs:154) ==146594== by 0x11DFC0: std::rt::lang_start::{{closure}} (rt.rs:166) ==146594== by 0x177D3A: call_once<(), (dyn core::ops::function::Fn<(), Output=i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe)> (function.rs:284) ==146594== by 0x177D3A: do_call<&(dyn core::ops::function::Fn<(), Output=i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe), i32> (panicking.rs:504) ==146594== by 0x177D3A: try<i32, &(dyn core::ops::function::Fn<(), Output=i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe)> (panicking.rs:468) ==146594== by 0x177D3A: catch_unwind<&(dyn core::ops::function::Fn<(), Output=i32> + core::marker::Sync + core::panic::unwind_safe::RefUnwindSafe), i32> (panic.rs:142) ==146594== by 0x177D3A: {closure#2} (rt.rs:148) ==146594== by 0x177D3A: do_call<std::rt::lang_start_internal::{closure_env#2}, isize> (panicking.rs:504) ==146594== by 0x177D3A: try<isize, std::rt::lang_start_internal::{closure_env#2}> (panicking.rs:468) ==146594== by 0x177D3A: catch_unwind<std::rt::lang_start_internal::{closure_env#2}, isize> (panic.rs:142) ==146594== by 0x177D3A: std::rt::lang_start_internal (rt.rs:148) ==146594== by 0x11DF99: std::rt::lang_start (rt.rs:165) ```

Put checks that detect UB under their own flag below debug_assertions Implementation of rust-lang/compiler-team#725

…errors Do not ICE on field access check on expr with `ty::Error` Fix rust-lang#123428

…lstrieb Stabilize const Atomic*::into_inner Partial stabilization for rust-lang#78729, for which the FCP has already completed. The other `into_inner` functions in that tracking issue (`UnsafeCell`, `Cell`, `RefCell`) are blocked on rust-lang#73255 for now. ```console error[E0493]: destructor of `UnsafeCell<T>` cannot be evaluated at compile-time --> library/core/src/cell.rs:2076:29 | 2076 | pub const fn into_inner(self) -> T { | ^^^^ the destructor for this type cannot be evaluated in constant functions 2077 | self.value 2078 | } | - value is dropped here ```

…tions_invariant, r=compiler-errors Add a debug asserts call to match_projection_projections to ensure invariant Small nit as follow up of rust-lang#123471. r? `@compiler-errors` `@bors` rollup=always

Rewrite `version` test run-make as an UI test Claiming the simple `version` test from rust-lang#121876. Reasoning: As discussed in rust-lang#123297, 10 years ago, some changes to CLI flags warranted the creation of the `version` test. Since it's not actually executing the compiled binary, it has no purpose being a `run-make` test and should instead be an UI test. This is the exact same change as it was shown on my closed PR rust-lang#123297. Changes were ready, but I did a major Git mishap while trying to fix a tidy error and messed up my branch. The details of this error are explained [here](rust-lang#123297 (comment)).

matthiaskrgr · 2024-04-06T22:51:48Z

@bors r+ rollup=never p=6

bors · 2024-04-06T22:51:52Z

📌 Commit 96dbde7 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-04-07T00:04:23Z

⌛ Testing commit 96dbde7 with merge 6f83750...

bors · 2024-04-07T02:06:13Z

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

rust-timer · 2024-04-07T02:07:54Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#119224	Drop panic hook after running tests	`da4270bbd5de1d3d5c19f53b4540ee71bdf88b4f` (link)
#123411	Put checks that detect UB under their own flag below debug_…	`d859891f8ba3926bf6c53c26e75679b335ffb2e8` (link)
#123516	Do not ICE on field access check on expr with `ty::Error`	`133203738f6a3a7674c42a9d68ebc018810d5524` (link)
#123522	Stabilize const Atomic*::into_inner	`30ca7b6c0a0b52ace5f418c1510f39aef5ec795d` (link)
#123559	Add a debug asserts call to match_projection_projections to…	`4b63382e9bf6a6d283288fd21b4b90d07fbf050a` (link)
#123563	Rewrite `version` test run-make as an UI test	`3ef76971a6b251c1692b9d324b2aac091b7f54d5` (link)

previous master: aa1c45908d

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-07T05:41:44Z

Finished benchmarking commit (6f83750): 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)	6.7%	[6.7%, 6.7%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-3.0%	[-3.0%, -3.0%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.9%	[-3.0%, 6.7%]	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)	2.3%	[2.3%, 2.3%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 670.181s -> 669.732s (-0.07%)
Artifact size: 318.20 MiB -> 318.22 MiB (0.00%)

dtolnay and others added 12 commits April 5, 2024 16:04

Stabilize const Atomic*::into_inner

ff88a9a

Put checks that detect UB under their own flag below debug_assertions

a7912cb

Do not ICE on field access check on expr with ty::Error

97ea48c

Fix rust-lang#123428

Add a debug asserts call to match_projection_projections to ensure in…

60be29b

…variant

Rewrite version test as UI test

a9c0ffa

fix: re-add stout ignore restore does-nothing fix: universal check-pass

Rollup merge of rust-lang#123411 - saethlin:ub-checks, r=Urgau,RalfJung

84dca15

Put checks that detect UB under their own flag below debug_assertions Implementation of rust-lang/compiler-team#725

Rollup merge of rust-lang#123516 - estebank:issue-123428, r=compiler-…

f51ce75

…errors Do not ICE on field access check on expr with `ty::Error` Fix rust-lang#123428

Rollup merge of rust-lang#123559 - spastorino:match_projection_projec…

7524f5e

…tions_invariant, r=compiler-errors Add a debug asserts call to match_projection_projections to ensure invariant Small nit as follow up of rust-lang#123471. r? `@compiler-errors` `@bors` rollup=always

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

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

bors merged commit 6f83750 into rust-lang:master Apr 7, 2024
12 checks passed

rustbot added this to the 1.79.0 milestone Apr 7, 2024

This was referenced Apr 7, 2024

Move alignment checks to codegen #117473

Draft

Rework ptr-to-ref conversion suggestion for method calls #123007

Merged

This was referenced Apr 7, 2024

Stabilize checking of cfgs at compile-time: --check-cfg option #123501

Merged

Clean up tests/ui by removing does-nothing.rs #123568

Merged

Move some tests #123569

Merged

matthiaskrgr deleted the rollup-9wiqkfa branch September 1, 2024 17:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #123576

Rollup of 6 pull requests #123576

matthiaskrgr commented Apr 6, 2024

matthiaskrgr commented Apr 6, 2024

bors commented Apr 6, 2024

bors commented Apr 7, 2024

bors commented Apr 7, 2024

rust-timer commented Apr 7, 2024

rust-timer commented Apr 7, 2024

Rollup of 6 pull requests #123576

Rollup of 6 pull requests #123576

Conversation

matthiaskrgr commented Apr 6, 2024

matthiaskrgr commented Apr 6, 2024

bors commented Apr 6, 2024

bors commented Apr 7, 2024

bors commented Apr 7, 2024

rust-timer commented Apr 7, 2024

rust-timer commented Apr 7, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size