Rollup of 6 pull requests #117125

matthiaskrgr · 2023-10-24T15:08:59Z

Successful merges:

Introduce -C instrument-coverage=branch to gate branch coverage #116094 (Introduce -C instrument-coverage=branch to gate branch coverage)
Migrate diagnostics in rustc_hir_analysis/src/coherence/orphan.rs #116396 (Migrate diagnostics in rustc_hir_analysis/src/coherence/orphan.rs)
Avoid unnecessary renumbering during borrowck #116792 (Avoid unnecessary renumbering during borrowck)
Add target features for LoongArch #116943 (Add target features for LoongArch)
Add method to convert internal to stable constructs #117010 (Add method to convert internal to stable constructs)
Add FileCheck annotations to MIR-opt inlining tests #117029 (Add FileCheck annotations to MIR-opt inlining tests )

r? @ghost
@rustbot modify labels: rollup

Note: We do not expect to provide internalizing methods for all StableMIR constructs. They exist only to help migrating efforts to allow users to mix StableMIR and internal constructs.

This flag has to be used in combination with `-Zunstable-options`, and is added in advance of adding branch coverage instrumentation.

…esleywiser Introduce `-C instrument-coverage=branch` to gate branch coverage This was extracted from rust-lang#115061 and can land independently from other coverage related work. The flag is unused for now, but is added in advance of adding branch coverage support. It is an unstable, nightly only flag that needs to be used in combination with `-Zunstable-options`, like so: `-Zunstable-options -C instrument-coverage=branch`. The goal is to develop branch coverage as an unstable opt-in feature first, before it matures and can be turned on by default.

…tics-7, r=oli-obk Migrate diagnostics in `rustc_hir_analysis/src/coherence/orphan.rs` r? `@compiler-errors`

Avoid unnecessary renumbering during borrowck Currently, after renumbering there are always unused `RegionVid`s if the return type contains any regions, this is due to `visit_ty` being called twice on the same `Ty`: once with `TyContext::ReturnTy` and once with `TyContext::LocalDecl { local: _0 }`. This PR skips renumbering the first time around.

Add target features for LoongArch

Add method to convert internal to stable constructs This is an alternative implementation to rust-lang#116999. I believe we can still improve the logic a bit here, but I wanted to see which direction we should go first. In this implementation, the API is simpler and we keep Tables somewhat private. The definition is still public though, since we have to expose the Stable trait. However, there's a cost of keeping another thread-local and using `Rc`, but I'm hoping it will be a small cost. r? `@oli-obk` r? `@spastorino`

…tests, r=cjgillot Add FileCheck annotations to MIR-opt inlining tests Part of rust-lang#116971, adds FileCheck annotations to MIR-opt tests in `tests/mir-opt/inline`. I left out a few (such as `inline_cycle`) where it mentioned that the particular outcome of inlining isn't important, just that the inliner doesn't get stuck in an infinite loop. r? cjgillot

matthiaskrgr · 2023-10-24T15:11:46Z

@bors r+ rollup=never p=6

bors · 2023-10-24T15:11:49Z

📌 Commit b90e06e has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-24T17:05:54Z

⌛ Testing commit b90e06e with merge 755b52e...

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#116094 (Introduce `-C instrument-coverage=branch` to gate branch coverage) - rust-lang#116396 (Migrate diagnostics in `rustc_hir_analysis/src/coherence/orphan.rs`) - rust-lang#116792 (Avoid unnecessary renumbering during borrowck) - rust-lang#116943 (Add target features for LoongArch) - rust-lang#117010 (Add method to convert internal to stable constructs) - rust-lang#117029 (Add FileCheck annotations to MIR-opt inlining tests ) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2023-10-24T17:26:28Z

The job test-various failed! Check out the build log: (web) (plain)

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

failures:

---- [mir-opt] tests/mir-opt/inline/inline_coroutine.rs stdout ----
4   fn main() -> () {
5       let mut _0: ();
6       let _1: std::ops::CoroutineState<i32, bool>;
-       let mut _2: std::pin::Pin<&mut {coroutine@$DIR/inline_coroutine.rs:17:5: 17:8}>;
-       let mut _3: &mut {coroutine@$DIR/inline_coroutine.rs:17:5: 17:8};
-       let mut _4: {coroutine@$DIR/inline_coroutine.rs:17:5: 17:8};
+       let mut _2: std::pin::Pin<&mut {coroutine@$DIR/inline_coroutine.rs:19:5: 19:8}>;
+       let mut _3: &mut {coroutine@$DIR/inline_coroutine.rs:19:5: 19:8};
+       let mut _4: {coroutine@$DIR/inline_coroutine.rs:19:5: 19:8};
10 +     let mut _5: bool;
11       scope 1 {
12           debug _r => _1;
13       }
13       }
14 +     scope 2 (inlined g) {
15 +     }
- +     scope 3 (inlined Pin::<&mut {coroutine@$DIR/inline_coroutine.rs:17:5: 17:8}>::new) {
+ +     scope 3 (inlined Pin::<&mut {coroutine@$DIR/inline_coroutine.rs:19:5: 19:8}>::new) {
17 +         debug pointer => _3;
18 +         scope 4 {
- +             scope 5 (inlined Pin::<&mut {coroutine@$DIR/inline_coroutine.rs:17:5: 17:8}>::new_unchecked) {
+ +             scope 5 (inlined Pin::<&mut {coroutine@$DIR/inline_coroutine.rs:19:5: 19:8}>::new_unchecked) {
20 +                 debug pointer => _3;
22 +         }

23 +     }
23 +     }
24 +     scope 6 (inlined g::{closure#0}) {
25 +         debug a => _5;
- +         let mut _6: &mut {coroutine@$DIR/inline_coroutine.rs:17:5: 17:8};
+ +         let mut _6: &mut {coroutine@$DIR/inline_coroutine.rs:19:5: 19:8};
27 +         let mut _7: u32;
28 +         let mut _8: i32;

34           StorageLive(_3);
35           StorageLive(_4);
35           StorageLive(_4);
36 -         _4 = g() -> [return: bb1, unwind unreachable];
- +         _4 = {coroutine@$DIR/inline_coroutine.rs:17:5: 17:8 (#0)};
+ +         _4 = {coroutine@$DIR/inline_coroutine.rs:19:5: 19:8 (#0)};
38 +         _3 = &mut _4;
- +         _2 = Pin::<&mut {coroutine@$DIR/inline_coroutine.rs:17:5: 17:8}> { pointer: move _3 };
+ +         _2 = Pin::<&mut {coroutine@$DIR/inline_coroutine.rs:19:5: 19:8}> { pointer: move _3 };
40 +         StorageDead(_3);
41 +         StorageLive(_5);
42 +         _5 = const false;
43 +         StorageLive(_6);
44 +         StorageLive(_7);
44 +         StorageLive(_7);
- +         _6 = (_2.0: &mut {coroutine@$DIR/inline_coroutine.rs:17:5: 17:8});
+ +         _6 = (_2.0: &mut {coroutine@$DIR/inline_coroutine.rs:19:5: 19:8});
46 +         _7 = discriminant((*_6));
47 +         switchInt(move _7) -> [0: bb3, 1: bb7, 3: bb8, otherwise: bb9];

49   
50       bb1: {
51 -         _3 = &mut _4;
51 -         _3 = &mut _4;
- -         _2 = Pin::<&mut {coroutine@$DIR/inline_coroutine.rs:17:5: 17:8}>::new(move _3) -> [return: bb2, unwind unreachable];
+ -         _2 = Pin::<&mut {coroutine@$DIR/inline_coroutine.rs:19:5: 19:8}>::new(move _3) -> [return: bb2, unwind unreachable];
53 +         StorageDead(_7);
54 +         StorageDead(_6);
55 +         StorageDead(_5);
59   
60       bb2: {
61 -         StorageDead(_3);
61 -         StorageDead(_3);
- -         _1 = <{coroutine@$DIR/inline_coroutine.rs:17:5: 17:8} as Coroutine<bool>>::resume(move _2, const false) -> [return: bb3, unwind unreachable];
+ -         _1 = <{coroutine@$DIR/inline_coroutine.rs:19:5: 19:8} as Coroutine<bool>>::resume(move _2, const false) -> [return: bb3, unwind unreachable];
63 +         StorageDead(_4);
64 +         _0 = const ();
65 +         StorageDead(_1);
thread '[mir-opt] tests/mir-opt/inline/inline_coroutine.rs' panicked at src/tools/compiletest/src/runtest.rs:4070:21:
Actual MIR output differs from expected MIR output /checkout/tests/mir-opt/inline/inline_coroutine.main.Inline.panic-abort.diff
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace


---- [mir-opt] tests/mir-opt/inline/inline_retag.rs stdout ----
40           Retag(_9);
41           _7 = &(*_9);
42           _6 = &(*_7);
- -         _0 = move _2(move _3, move _6) -> [return: bb1, unwind continue];
+ -         _0 = move _2(move _3, move _6) -> [return: bb1, unwind unreachable];
45 - 
46 -     bb1: {

thread '[mir-opt] tests/mir-opt/inline/inline_retag.rs' panicked at src/tools/compiletest/src/runtest.rs:4070:21:
thread '[mir-opt] tests/mir-opt/inline/inline_retag.rs' panicked at src/tools/compiletest/src/runtest.rs:4070:21:
Actual MIR output differs from expected MIR output /checkout/tests/mir-opt/inline/inline_retag.bar.Inline.diff

failures:
    [mir-opt] tests/mir-opt/inline/inline_coroutine.rs
    [mir-opt] tests/mir-opt/inline/inline_retag.rs

bors · 2023-10-24T17:26:46Z

💔 Test failed - checks-actions

JonasAlaif and others added 30 commits October 16, 2023 14:29

Avoid unnecessary renumbering

2bba98b

FileCheck asm_unwind

eb31d7e

FileCheck caller_with_trivial_bound

07bb2d5

FileCheck cycle

d9205cd

FileCheck dont_ice_on_generic_rust_call

820e791

FileCheck dyn_trait

2e9a7c2

FileCheck exponential_runtime

dfe047c

FileCheck inline_any_operand

8436a46

FileCheck inline_box_fn

359d2ab

FileCheck inline_closure_borrows_arg

d67e934

FileCheck inline_closure_captures

b901553

FileCheck inline_closure

149b882

FileCheck inline_compatibility

82a9ff0

FileCheck inline_diverging

196c9ef

FileCheck inline_coroutine

ac2278b

FileCheck inline_instruction_set

1313866

FileCheck inline_into_box_place

6e01ab9

FileCheck inline_options

0764c8b

FileCheck inline_retag

0a8a013

FileCheck inline_specialization

af6b86e

FileCheck inline_trait_method_2

ac19ff3

FileCheck inline_trait_method

6eedec5

FileCheck inline_as_ref_as_mut

2846971

FileCheck inline_scopes_parenting

13fe05c

FileCheck issue_78442

1950f29

FileCheck unchecked_shifts

587926c

FileCheck unsized_argument

1fa2601

FileCheck unwrap_unchecked

f474cf4

address review comments

1f35769

Add method to convert internal to stable constructs

66a554b

celinval and others added 14 commits October 23, 2023 12:11

Add internal() method counterpart to stable()

f613b26

Note: We do not expect to provide internalizing methods for all StableMIR constructs. They exist only to help migrating efforts to allow users to mix StableMIR and internal constructs.

Remove unsafe and Rc

421631a

compiler: Add target features for LoongArch

cb61816

tests: Add features-gate for LoongArch

6cf9423

tests/ui/abi/compatibility: Set min-llvm-version to 17 for LoongArch64

300d04d

Add test and remove double ref

ae86f59

Introduce -C instrument-coverage=branch to gate branch coverage

2b36547

This flag has to be used in combination with `-Zunstable-options`, and is added in advance of adding branch coverage instrumentation.

Migrate diagnostics in rustc_hir_analysis/src/coherence/orphan.rs

68f5536

Rollup merge of rust-lang#116396 - obeis:hir-analysis-migrate-diagnos…

65297e0

…tics-7, r=oli-obk Migrate diagnostics in `rustc_hir_analysis/src/coherence/orphan.rs` r? `@compiler-errors`

Rollup merge of rust-lang#116943 - heiher:target-features, r=wesleywiser

edba0cb

Add target features for LoongArch

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Oct 24, 2023

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

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 24, 2023

matthiaskrgr mentioned this pull request Oct 24, 2023

Add FileCheck annotations to MIR-opt inlining tests #117029

Merged

matthiaskrgr closed this Oct 24, 2023

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #117125

Rollup of 6 pull requests #117125

matthiaskrgr commented Oct 24, 2023

matthiaskrgr commented Oct 24, 2023

bors commented Oct 24, 2023

bors commented Oct 24, 2023

rust-log-analyzer commented Oct 24, 2023

bors commented Oct 24, 2023

Rollup of 6 pull requests #117125

Rollup of 6 pull requests #117125

Conversation

matthiaskrgr commented Oct 24, 2023

matthiaskrgr commented Oct 24, 2023

bors commented Oct 24, 2023

bors commented Oct 24, 2023

rust-log-analyzer commented Oct 24, 2023

bors commented Oct 24, 2023