Rollup of 8 pull requests #111631

Dylan-DPC · 2023-05-16T06:17:34Z

Successful merges:

Rework handling of recursive panics #110975 (Rework handling of recursive panics)
Recover impl<T ?Sized> correctly #111449 (Recover impl<T ?Sized> correctly)
Document that missing_copy_implementations and missing_debug_implementations only apply to public items. #111572 (Document that missing_copy_implementations and missing_debug_implementations only apply to public items.)
Suppress "erroneous constant used" for constants tainted by errors #111602 (Suppress "erroneous constant used" for constants tainted by errors)
fixup version placeholder for cfi_encoding feature #111605 (fixup version placeholder for cfi_encoding feature)
Add clubby789 to the bootstrap review rotation #111607 (Add clubby789 to the bootstrap review rotation)
Add timings for MIR passes to profiling report #111619 (Add timings for MIR passes to profiling report)
debug format Const's less verbosely #111630 (debug format Const's less verbosely)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

…mentations` only apply to public items.

When constant evaluation fails because its MIR is tainted by errors, suppress note indicating that erroneous constant was used, since those errors have to be fixed regardless of the constant being used or not.

Rework handling of recursive panics This PR makes 2 changes to how recursive panics works (a panic while handling a panic). 1. The panic count is no longer used to determine whether to force an immediate abort. This allows code like the following to work without aborting the process immediately: ```rust struct Double; impl Drop for Double { fn drop(&mut self) { // 2 panics are active at once, but this is fine since it is caught. std::panic::catch_unwind(|| panic!("twice")); } } let _d = Double; panic!("once"); ``` Rustc already generates appropriate code so that any exceptions escaping out of a `Drop` called in the unwind path will immediately abort the process. 2. Any panics while the panic hook is executing will force an immediate abort. This is necessary to avoid potential deadlocks like rust-lang#110771 where a panic happens while holding the backtrace lock. We don't even try to print the panic message in this case since the panic may have been caused by `Display` impls. Fixes rust-lang#110771

…ics-correctly, r=Nilstrieb Recover `impl<T ?Sized>` correctly Fixes rust-lang#111327 r? `@Nilstrieb` but you can re-roll Alternatively, happy to close this if we're okay with just saying "sorry rust-lang#111327 is just a poor side-effect of parser ambiguity" 🤷

Document that `missing_copy_implementations` and `missing_debug_implementations` only apply to public items. I encountered rust-lang#111359 (fixed) and noticed that the documentation didn't say that it was _intended_ that `missing_debug_implementations` only applies to public items. This PR fixes that, and makes the same wording change to `missing_copy_implementations` which has the same condition. I chose the words to also be similar to `missing_docs` which already had such a remark.

…=oli-obk Suppress "erroneous constant used" for constants tainted by errors When constant evaluation fails because its MIR is tainted by errors, suppress note indicating that erroneous constant was used, since those errors have to be fixed regardless of the constant being used or not. Fixes rust-lang#110891.

…rrors fixup version placeholder for `cfi_encoding` feature Mentioned rust-lang#105452 (comment)

Add clubby789 to the bootstrap review rotation r? ``@clubby789`` - thank you for volunteering! I have been meaning for a very long time now to write up how to do reviews, but I haven't gotten around to it yet :( here is a short summary: 1. If you're not sure what the changes does or if it's ok, always feel free to ping someone else on the team, especially in the first few weeks. You can use `r? bootstrap` to get triagebot to assign someone else. 2. Bootstrap unfortunately has very few tests. Things that touch CLI or toml parsing should likely have a test in `src/bootstrap/config/tests.rs`; things that touch "core" build logic should have a test in `builder/tests.rs`, anything else kinda just slips in :( see rust-lang#102563 for ideas on how to improve the situation here. 3. "Major" changes should be documented in `src/bootstrap/CHANGELOG.md`. "Major" is up to you, but if it breaks a config option or otherwise is likely to break *someone's* build, it's probably major. If it breaks nearly *everyone*'s build, it should also update `VERSION` in `lib.rs`; this should be very rare. Please also ping me or Mark-Simulacrum for major changes (I might set up a triagebot ping for this so you don't have to remember). 4. Once you've approved the PR, tell bors it's ok - you've been contributing for a while so you know how bors works, but here's a cheatsheet just in case: https://bors.rust-lang.org Documentation about how to use bootstrap lives at https://rustc-dev-guide.rust-lang.org/building/bootstrapping.html; internal docs live in `src/bootstrap/README.md`. The latter unfortunately is not very complete.

Add timings for MIR passes to profiling report This will help identify which pass is responsible for a regression.

… r=compiler-errors debug format `Const`'s less verbosely Not user visible change only visible to people debugging const generics. Currently debug output for `ty::Const` is super verbose (even for `-Zverbose` lol), things like printing infer vars as `Infer(Var(?0c))` instead of just `?0c`, bound vars and placeholders not using `^0_1` or `!0_1` syntax respectively. With these changes its imo better but not perfect: `Const { ty: usize, kind: ^0_1 }` is still a lot for not much information. not entirely sure what to do about that so not dealing with it yet. Need to do formatting for `ConstKind::Expr` at some point too since rn it sucks (doesn't even print anything with `Display`) not gonna do that in this PR either. r? `@compiler-errors`

Dylan-DPC · 2023-05-16T06:17:51Z

@bors r+ rollup=never p=5

bors · 2023-05-16T06:17:53Z

📌 Commit 1ffa6a1 has been approved by Dylan-DPC

It is now in the queue for this repository.

rust-log-analyzer · 2023-05-16T06:53:53Z

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

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


---- [mir-opt] tests/mir-opt/nll/region_subtyping_basic.rs stdout ----
22 |
23 fn main() -> () {
24     let mut _0: ();                      // return place in scope 0 at $DIR/region_subtyping_basic.rs:+0:11: +0:11
-     let mut _1: [usize; Const(Value(Leaf(0x00000003)): usize)]; // in scope 0 at $DIR/region_subtyping_basic.rs:+1:9: +1:14
+     let mut _1: [usize; Const { ty: usize, kind: Leaf(0x00000003) }]; // in scope 0 at $DIR/region_subtyping_basic.rs:+1:9: +1:14
26     let _3: usize;                       // in scope 0 at $DIR/region_subtyping_basic.rs:+2:16: +2:17
27     let mut _4: usize;                   // in scope 0 at $DIR/region_subtyping_basic.rs:+2:14: +2:18
28     let mut _5: bool;                    // in scope 0 at $DIR/region_subtyping_basic.rs:+2:14: +2:18
Build completed unsuccessfully in 0:01:26
Build completed unsuccessfully in 0:01:26
thread '[mir-opt] tests/mir-opt/nll/region_subtyping_basic.rs' panicked at 'Actual MIR output differs from expected MIR output /checkout/tests/mir-opt/nll/region_subtyping_basic.main.nll.0.32bit.mir', src/tools/compiletest/src/runtest.rs:3634:21


failures:
    [mir-opt] tests/mir-opt/nll/region_subtyping_basic.rs

Noratrieb · 2023-05-16T06:54:00Z

@bors r- #111630 failed

Amanieu and others added 18 commits May 14, 2023 20:10

Rework handling of recursive panics

cf7131e

Add support for nested panics to miri

9c58f91

Document that missing_copy_implementations and `missing_debug_imple…

980b392

…mentations` only apply to public items.

Suppress "erroneous constant used" for constants tainted by errors

67f455a

When constant evaluation fails because its MIR is tainted by errors, suppress note indicating that erroneous constant was used, since those errors have to be fixed regardless of the constant being used or not.

fixup version placeholder for cfi_encoding feature

9799fb1

Add clubby789 to the bootstrap review rotation

29a81f5

Recover impl<T ?Sized> correctly

a5763ff

Profile MIR passes.

addc727

format Const's less verbosely

ea57898

bless

d983b11

Rollup merge of rust-lang#111605 - klensy:fixup_version, r=compiler-e…

d241adb

…rrors fixup version placeholder for `cfi_encoding` feature Mentioned rust-lang#105452 (comment)

Rollup merge of rust-lang#111619 - cjgillot:profile-pass, r=WaffleLapkin

049885f

Add timings for MIR passes to profiling report This will help identify which pass is responsible for a regression.

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 May 16, 2023

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 16, 2023

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 16, 2023

Noratrieb closed this May 16, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #111631

Rollup of 8 pull requests #111631

Dylan-DPC commented May 16, 2023

Dylan-DPC commented May 16, 2023

bors commented May 16, 2023

rust-log-analyzer commented May 16, 2023

Noratrieb commented May 16, 2023

Rollup of 8 pull requests #111631

Rollup of 8 pull requests #111631

Conversation

Dylan-DPC commented May 16, 2023

Dylan-DPC commented May 16, 2023

bors commented May 16, 2023

rust-log-analyzer commented May 16, 2023

Noratrieb commented May 16, 2023