return unfixed len if pat has reported error #117046

bvanjoi · 2023-10-22T11:03:53Z

This issue arises due to the creation of a fixed-length pattern, as a result of the mir body corruption. The corruption taints tcx.eval_to_allocation_raw, causing it to return AlreadyReported. Consequently, this prevents len.try_eval_target_usize from evaluating correctly and returns None. Lastly, it results in the return of [usize; min_len].

To rectify this issue, my approach is that to return unfixed when encountering ErrorHandled::Reported. Additionally, in instances of ErrorHandled::TooGeneric, the previous logic has been reinstated.

rustbot · 2023-10-22T11:04:02Z

r? @compiler-errors

(rustbot has picked a reviewer for you, use r? to override)

bvanjoi · 2023-10-22T11:15:00Z

I had just discovered a PR(#113712) to solve similar problems and this comment, therefore I'm drawing the attention of @oli-obk to this PR.

bvanjoi · 2023-10-22T11:19:01Z

I believe this PR also addresses #113021. However, since the test cases are mostly the same, I will refrain from adding an extra case.

oli-obk

Yea, this lgtm as a fix. It propagates the error instead of dropping it on the floor.

compiler/rustc_hir_typeck/src/pat.rs

oli-obk · 2023-10-23T14:24:14Z

@bors r+ rollup

Thanks!

bors · 2023-10-23T14:24:17Z

📌 Commit 6de40ab has been approved by oli-obk

It is now in the queue for this repository.

return unfixed len if pat has reported error - Fixes rust-lang#116186 - Fixes rust-lang#113021 This issue arises due to the creation of a fixed-length pattern, as a result of the mir body corruption. The corruption taints `tcx.eval_to_allocation_raw`, causing it to return `AlreadyReported`. Consequently, this prevents `len.try_eval_target_usize` from evaluating correctly and returns `None`. Lastly, it results in the return of `[usize; min_len]`. To rectify this issue, my approach is that to return unfixed when encountering `ErrorHandled::Reported`. Additionally, in instances of `ErrorHandled::TooGeneric`, the previous logic has been reinstated.

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#115796 (Generate aggregate constants in DataflowConstProp.) - rust-lang#116859 (Make `ty::print::Printer` take `&mut self` instead of `self`) - rust-lang#117046 (return unfixed len if pat has reported error) - rust-lang#117070 (rustdoc: wrap Type with Box instead of Generics) - rust-lang#117074 (Remove smir from triage and add me to stablemir) - rust-lang#117086 (Update .mailmap to promote my livename) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#107159 (rand use getrandom for freebsd (available since 12.x)) - rust-lang#116859 (Make `ty::print::Printer` take `&mut self` instead of `self`) - rust-lang#117046 (return unfixed len if pat has reported error) - rust-lang#117070 (rustdoc: wrap Type with Box instead of Generics) - rust-lang#117074 (Remove smir from triage and add me to stablemir) - rust-lang#117086 (Update .mailmap to promote my livename) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#117046 - bvanjoi:fix-116186, r=oli-obk return unfixed len if pat has reported error - Fixes rust-lang#116186 - Fixes rust-lang#113021 This issue arises due to the creation of a fixed-length pattern, as a result of the mir body corruption. The corruption taints `tcx.eval_to_allocation_raw`, causing it to return `AlreadyReported`. Consequently, this prevents `len.try_eval_target_usize` from evaluating correctly and returns `None`. Lastly, it results in the return of `[usize; min_len]`. To rectify this issue, my approach is that to return unfixed when encountering `ErrorHandled::Reported`. Additionally, in instances of `ErrorHandled::TooGeneric`, the previous logic has been reinstated.

rustbot assigned compiler-errors Oct 22, 2023

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. labels Oct 22, 2023

oli-obk approved these changes Oct 23, 2023

View reviewed changes

compiler/rustc_hir_typeck/src/pat.rs Outdated Show resolved Hide resolved

compiler-errors assigned oli-obk and unassigned compiler-errors Oct 23, 2023

return unfixed len if pat has reported error

6de40ab

bvanjoi force-pushed the fix-116186 branch from 530d0d7 to 6de40ab Compare October 23, 2023 14:15

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

oli-obk mentioned this pull request Oct 23, 2023

Fix ICE when trying to convert ConstKind::Error to usize #113712

Closed

matthiaskrgr mentioned this pull request Oct 23, 2023

Rollup of 7 pull requests #117096

Closed

matthiaskrgr mentioned this pull request Oct 23, 2023

Rollup of 6 pull requests #117098

Closed

matthiaskrgr mentioned this pull request Oct 23, 2023

Rollup of 6 pull requests #117103

Merged

bors merged commit 7e607e8 into rust-lang:master Oct 24, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 24, 2023

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

return unfixed len if pat has reported error #117046

return unfixed len if pat has reported error #117046

bvanjoi commented Oct 22, 2023 •

edited

Loading

rustbot commented Oct 22, 2023

bvanjoi commented Oct 22, 2023

bvanjoi commented Oct 22, 2023

oli-obk left a comment

oli-obk commented Oct 23, 2023

bors commented Oct 23, 2023

return unfixed len if pat has reported error #117046

return unfixed len if pat has reported error #117046

Conversation

bvanjoi commented Oct 22, 2023 • edited Loading

rustbot commented Oct 22, 2023

bvanjoi commented Oct 22, 2023

bvanjoi commented Oct 22, 2023

oli-obk left a comment

Choose a reason for hiding this comment

oli-obk commented Oct 23, 2023

bors commented Oct 23, 2023

bvanjoi commented Oct 22, 2023 •

edited

Loading