Add FileCheck annotations to dataflow-const-prop tests #119759

sfzhu93 · 2024-01-09T04:28:25Z

A few shadowing variable names are changed, so that it is easier to match the variable names in MIR using FileCheck syntax.

Also, there's a FIXME in enum.rs because the MIR looks suspicious to me. It has been explained in the comments.

r? cjgillot

rustbot · 2024-01-09T04:28:34Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @cjgillot (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

@rustbot author: the review is finished, PR author should check the comments and take action accordingly
@rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

cjgillot

Thanks a lot @sfzhu93!
Some remarks are generic, about simplifications to the patterns.
Some others are more substantial about what we are trying to test.

tests/mir-opt/dataflow-const-prop/array_index.rs

tests/mir-opt/dataflow-const-prop/checked.rs

tests/mir-opt/dataflow-const-prop/enum.rs

tests/mir-opt/dataflow-const-prop/issue_81605.rs

tests/mir-opt/dataflow-const-prop/if.rs

tests/mir-opt/dataflow-const-prop/ref_without_sb.rs

tests/mir-opt/dataflow-const-prop/repeat.rs

sfzhu93

@cjgillot Thank you for your comment! I updated according to your comments. For some trick cases that we may need to take a closer look or even file a issue/pr in the future, I added a few fixmes.

tests/mir-opt/dataflow-const-prop/array_index.rs

tests/mir-opt/dataflow-const-prop/checked.rs

tests/mir-opt/dataflow-const-prop/default_boxed_slice.rs

tests/mir-opt/dataflow-const-prop/enum.rs

tests/mir-opt/dataflow-const-prop/inherit_overflow.rs

tests/mir-opt/dataflow-const-prop/large_array_index.rs

tests/mir-opt/dataflow-const-prop/repeat.rs

cjgillot · 2024-01-26T23:17:30Z

Great @sfzhu93!
@bors r+

bors · 2024-01-26T23:17:32Z

📌 Commit 65b1083 has been approved by cjgillot

It is now in the queue for this repository.

Add FileCheck annotations to dataflow-const-prop tests part of rust-lang#116971. A few shadowing variable names are changed, so that it is easier to match the variable names in MIR using FileCheck syntax. Also, there's a FIXME in [enum.rs](https://github.com/rust-lang/rust/pull/119759/files#diff-7621f55327838e489a95ac99ae1e6126b37c57aff582594e6bee9d7e7e56fc58) because the MIR looks suspicious to me. It has been explained in the comments. r? cjgillot

Rollup of 9 pull requests Successful merges: - rust-lang#111379 (Boost iterator intersperse(_with) performance) - rust-lang#118182 (Properly recover from trailing attr in body) - rust-lang#119641 (Remove feature not required by `Ipv6Addr::to_cononical` doctest) - rust-lang#119759 (Add FileCheck annotations to dataflow-const-prop tests) - rust-lang#120275 (Avoid ICE in trait without `dyn` lint) - rust-lang#120376 (Update codegen test for LLVM 18) - rust-lang#120386 (ScopeTree: remove destruction_scopes as unused) - rust-lang#120398 (Improve handling of numbers in `IntoDiagnosticArg`) - rust-lang#120399 (Remove myself from review rotation) r? `@ghost` `@rustbot` modify labels: rollup

Nadrieril · 2024-01-27T04:58:07Z

Got this error in rollup, which I assume is from this

sfzhu93 · 2024-01-27T07:38:13Z

I closed the PR by mistake during rebase and test, and cannot reopen. I submitted a ticket to GitHub customer support and see if it can be reopened.

The problem is, it should be unwind unreachable for wasm32. In the original test, it was unwind continue.

cjgillot · 2024-01-27T10:57:37Z

2 ways to do this:

either you force-push the former commit, reopen, and force-push the rebased branch;
or you open a new PR.

sfzhu93 · 2024-01-29T06:48:22Z

Successfully restored the original repo! I used GitHub's CLI to restore: gh pr checkout 119759. I have tested against wasm32-unknown-unknown locally, which should make bors rollup work. The CI we used here is less strict than bors.

sfzhu93 · 2024-01-31T03:44:20Z

@rustbot ready
@cjgillot I guess I need your approval for bors rollup

cjgillot · 2024-01-31T20:17:53Z

@bors r+ rollup

bors · 2024-01-31T20:17:55Z

📌 Commit 699b59c has been approved by cjgillot

It is now in the queue for this repository.

Add FileCheck annotations to dataflow-const-prop tests part of rust-lang#116971. A few shadowing variable names are changed, so that it is easier to match the variable names in MIR using FileCheck syntax. Also, there's a FIXME in [enum.rs](https://github.com/rust-lang/rust/pull/119759/files#diff-7621f55327838e489a95ac99ae1e6126b37c57aff582594e6bee9d7e7e56fc58) because the MIR looks suspicious to me. It has been explained in the comments. r? cjgillot

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#119759 (Add FileCheck annotations to dataflow-const-prop tests) - rust-lang#120323 (On E0277 be clearer about implicit `Sized` bounds on type params and assoc types) - rust-lang#120473 (Only suggest removal of `as_*` and `to_` conversion methods on E0308) - rust-lang#120520 (Some cleanups around diagnostic levels.) - rust-lang#120540 (add test for try-block-in-match-arm) - rust-lang#120547 (`#![feature(inline_const_pat)]` is no longer incomplete) - rust-lang#120552 (Correctly check `never_type` feature gating) - rust-lang#120555 (put pnkfelix (me) back on the review queue.) - rust-lang#120556 (Improve the diagnostics for unused generic parameters) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#119759 (Add FileCheck annotations to dataflow-const-prop tests) - rust-lang#120323 (On E0277 be clearer about implicit `Sized` bounds on type params and assoc types) - rust-lang#120473 (Only suggest removal of `as_*` and `to_` conversion methods on E0308) - rust-lang#120540 (add test for try-block-in-match-arm) - rust-lang#120547 (`#![feature(inline_const_pat)]` is no longer incomplete) - rust-lang#120552 (Correctly check `never_type` feature gating) - rust-lang#120555 (put pnkfelix (me) back on the review queue.) - rust-lang#120556 (Improve the diagnostics for unused generic parameters) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#119759 - sfzhu93:master, r=cjgillot Add FileCheck annotations to dataflow-const-prop tests part of rust-lang#116971. A few shadowing variable names are changed, so that it is easier to match the variable names in MIR using FileCheck syntax. Also, there's a FIXME in [enum.rs](https://github.com/rust-lang/rust/pull/119759/files#diff-7621f55327838e489a95ac99ae1e6126b37c57aff582594e6bee9d7e7e56fc58) because the MIR looks suspicious to me. It has been explained in the comments. r? cjgillot

sfzhu93 added 10 commits January 7, 2024 21:16

Add FileCheck for array_index.rs, boolean_identities.rs and cast.rs

1eaeaaf

Add FileCheck for checked.rs and default_boxed_slice.rs.

e05c779

Add FileCheck for enum.rs

33e5d85

Add FileCheck for if.rs, inherit_overflow.rs, issue_81605.rs

24aefa0

Add FileCheck to 3 tests: large_array_index, mult_by_zero, and offset_of

9452d7e

Add FileCheck to 3 tests: ref_without_sb, repeat, repr_transparent

e9152e2

Add FileCheck to 3 tests: self_assign_add, self_assign, and sibling_ptr

3ab1d5d

Add FileCheck to slice_len.rs

d765e3a

Add FileCheck to struct.rs

732f6a1

Add FileCheck to terminator.rs and tuple.rs

1adda9a

rustbot assigned cjgillot Jan 9, 2024

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 9, 2024

This comment has been minimized.

Sign in to view

Add FileCheck for enum.rs

7135168

cjgillot reviewed Jan 11, 2024

View reviewed changes

sfzhu93 added 4 commits January 11, 2024 23:22

resolve code reviews

d63f10b

resolve code reviews

1c886d7

update enum.rs for code review

cd77d59

add FIXME for default_boxed_slice.rs

5747ece

sfzhu93 commented Jan 15, 2024

View reviewed changes

cjgillot reviewed Jan 20, 2024

View reviewed changes

sfzhu93 added 3 commits January 20, 2024 08:09

update misuse of check-label

edba949

finish a pattern in enum.rs

7ad307d

update enum.rs

65b1083

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 Jan 26, 2024

Nadrieril mentioned this pull request Jan 27, 2024

Rollup of 9 pull requests #120409

Closed

sfzhu93 deleted the branch rust-lang:master January 27, 2024 06:04

sfzhu93 closed this Jan 27, 2024

sfzhu93 deleted the master branch January 27, 2024 06:05

sfzhu93 restored the master branch January 29, 2024 06:32

sfzhu93 reopened this Jan 29, 2024

update terminator.rs

699b59c

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 31, 2024

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 31, 2024

matthiaskrgr mentioned this pull request Feb 1, 2024

Rollup of 9 pull requests #120560

Closed

matthiaskrgr mentioned this pull request Feb 1, 2024

Rollup of 9 pull requests #120561

Closed

matthiaskrgr mentioned this pull request Feb 4, 2024

Rollup of 8 pull requests #120649

Merged

bors merged commit 2b25957 into rust-lang:master Feb 5, 2024
11 checks passed

rustbot added this to the 1.78.0 milestone Feb 5, 2024

sfzhu93 deleted the master branch February 5, 2024 07:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add FileCheck annotations to dataflow-const-prop tests #119759

Add FileCheck annotations to dataflow-const-prop tests #119759

sfzhu93 commented Jan 9, 2024 •

edited

Loading

rustbot commented Jan 9, 2024

This comment has been minimized.

cjgillot left a comment

sfzhu93 left a comment

cjgillot commented Jan 26, 2024

bors commented Jan 26, 2024

Nadrieril commented Jan 27, 2024

sfzhu93 commented Jan 27, 2024 •

edited

Loading

cjgillot commented Jan 27, 2024

sfzhu93 commented Jan 29, 2024 •

edited

Loading

sfzhu93 commented Jan 31, 2024

cjgillot commented Jan 31, 2024

bors commented Jan 31, 2024

Add FileCheck annotations to dataflow-const-prop tests #119759

Add FileCheck annotations to dataflow-const-prop tests #119759

Conversation

sfzhu93 commented Jan 9, 2024 • edited Loading

rustbot commented Jan 9, 2024

This comment has been minimized.

cjgillot left a comment

Choose a reason for hiding this comment

sfzhu93 left a comment

Choose a reason for hiding this comment

cjgillot commented Jan 26, 2024

bors commented Jan 26, 2024

Nadrieril commented Jan 27, 2024

sfzhu93 commented Jan 27, 2024 • edited Loading

cjgillot commented Jan 27, 2024

sfzhu93 commented Jan 29, 2024 • edited Loading

sfzhu93 commented Jan 31, 2024

cjgillot commented Jan 31, 2024

bors commented Jan 31, 2024

sfzhu93 commented Jan 9, 2024 •

edited

Loading

sfzhu93 commented Jan 27, 2024 •

edited

Loading

sfzhu93 commented Jan 29, 2024 •

edited

Loading