Avoid duplicating StorageLive in let-else #101894

dingxiangfei2009 · 2022-09-16T11:06:48Z

Fix #101867
Fix #101932

#101410 introduced directives to activate storages of bindings in let-else earlier. However, since it is using the machinery of match and friends for pattern matching and binding, those storages are activated for the second time. This PR adjusts this behavior and avoid the duplicated activation for let-else statements.

rust-highfive · 2022-09-16T11:06:51Z

r? @oli-obk

(rust-highfive has picked a reviewer for you, use r? to override)

dingxiangfei2009 · 2022-09-16T11:07:25Z

./x.py test src/tools/miri is now passing again after this change. You may try it out.

oli-obk · 2022-09-16T11:08:49Z

Please also add a mir-opt test. #101410 (comment) seems like a good candidate as it is very minimal.

compiler/rustc_mir_build/src/build/matches/mod.rs

Mark-Simulacrum · 2022-09-16T12:07:17Z

Preemptively beta-nominating for backport to 1.65 (into which #101410 landed), since it seems likely this would otherwise only make 1.66. (If we reject this we'll likely want to post a revert for #101410, but this was an easier first step to track the need).

dingxiangfei2009 · 2022-09-16T12:13:14Z

@oli-obk Thank you! I have added that test mentioned in the #101410 thread. I have tentatively selected mir_map which is hopefully very close to the original MIR generated. Please advise better choices. 🙏

est31 · 2022-09-17T20:07:45Z

@dingxiangfei2009 now that #93628 has been merged, can you rebase this PR? Most importantly, the test files will need #![cfg_attr(bootstrap, feature(let_else))], instead of #![feature(let_else)].

Also, would it be possible to add the example from #101932 as a run-pass regression test? So add // run-pass to it as well as // issue #101932, and put it e.g. into src/test/ui/let-else/const-fn.rs.

dingxiangfei2009 · 2022-09-18T04:20:08Z

@est31 branch rebased with the test case from #101932

cc @oli-obk for the relevant changes.

RalfJung · 2022-09-19T06:58:59Z

This issue is completely blocking Miri development, would be good to get the fix landed ASAP. :)

oli-obk · 2022-09-19T12:24:30Z

@bors r+ p=1 (unblocks miri)

bors · 2022-09-19T12:24:31Z

📌 Commit eb36f5e has been approved by oli-obk

It is now in the queue for this repository.

RalfJung · 2022-09-19T12:36:42Z

@bors p=10

bors · 2022-09-19T17:27:33Z

⌛ Testing commit eb36f5e with merge 2019147...

bors · 2022-09-19T20:08:36Z

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 2019147 to master...

rust-timer · 2022-09-19T22:00:46Z

Finished benchmarking commit (2019147): 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)	-	-	0
Regressions ❌ (secondary)	2.6%	[2.2%, 3.3%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Cycles

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

the arithmetic mean of the percent change ↩
number of relevant changes ↩

apiraino · 2022-09-22T14:13:05Z

Beta backport approved as per compiler team on Zulip

@rustbot label +beta-accepted

RalfJung · 2022-09-22T14:14:57Z

Judging from this the release team will do the beta backports so I consider this done from my end now. :)

…gfei2009 Fix lint scoping for let-else. The scoping for let-else is inconsistent with HIR nesting. This creates cases, in `ui/let-else/let-else-allow-unused.rs` for instance, where an `allow` lint attribute does not apply to the bindings created by `let-else`. This PR is an attempt to correct this. As there is no lint that currently relies on this, the test for this behaviour is rust-lang#101500. cc `@dingxiangfei2009` as you filed rust-lang#101894

…ei2009 Fix lint scoping for let-else. The scoping for let-else is inconsistent with HIR nesting. This creates cases, in `ui/let-else/let-else-allow-unused.rs` for instance, where an `allow` lint attribute does not apply to the bindings created by `let-else`. This PR is an attempt to correct this. As there is no lint that currently relies on this, the test for this behaviour is rust-lang#101500. cc `@dingxiangfei2009` as you filed rust-lang#101894

[beta] backports * Avoid duplicating StorageLive in let-else rust-lang#101894 * Re-add HRTB implied static bug note rust-lang#101924 * Revert "Copy stage0 binaries into stage0-sysroot" rust-lang#101942 * implied_bounds: deal with inference vars rust-lang#102016 * fix ConstProp handling of written_only_inside_own_block_locals rust-lang#102045 * Fix wrongly refactored Lift impl rust-lang#102088 * Fix a typo “pararmeter” in error message rust-lang#102119 * Deny associated type bindings within associated type bindings rust-lang#102338 * Continue migration of CSS themes rust-lang#101934 * Fix search result colors rust-lang#102369 * Fix unwind drop glue for if-then scopes rust-lang#102394 * Revert "Use getentropy when possible on all Apple platforms" rust-lang#102693 * Fix associated type bindings with anon const in GAT position rust-lang#102336 * Revert perf-regression 101620 rust-lang#102064 * `EscapeAscii` is not an `ExactSizeIterator` rust-lang#99880

rust-highfive assigned oli-obk Sep 16, 2022

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 16, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 16, 2022

oli-obk reviewed Sep 16, 2022

View reviewed changes

compiler/rustc_mir_build/src/build/matches/mod.rs Show resolved Hide resolved

Mark-Simulacrum added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 16, 2022

dingxiangfei2009 requested a review from oli-obk September 16, 2022 12:13

est31 mentioned this pull request Sep 17, 2022

StorageLive already live in const let else regression #101932

Closed

dingxiangfei2009 added 3 commits September 18, 2022 12:10

avoid duplicating StorageLive in let-else

48c1c1d

add mir-opt test

d510ba3

add miri test via const fn

eb36f5e

dingxiangfei2009 force-pushed the let-else-avoid-duplicate-storage-live branch from a7d87c9 to eb36f5e Compare September 18, 2022 04:18

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 Sep 19, 2022

oli-obk mentioned this pull request Sep 19, 2022

Make miri a subtree instead of a submodule #102028

Merged

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 19, 2022

bors merged commit 2019147 into rust-lang:master Sep 19, 2022

rustbot added this to the 1.66.0 milestone Sep 19, 2022

bors mentioned this pull request Sep 19, 2022

Perform unused assignment and unused variables lints on MIR. #101500

Open

dingxiangfei2009 deleted the let-else-avoid-duplicate-storage-live branch September 20, 2022 06:46

rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Sep 22, 2022

cjgillot mentioned this pull request Sep 25, 2022

Fix lint scoping for let-else. #102257

Merged

cuviper mentioned this pull request Oct 4, 2022

[beta] backports #102676

Merged

cuviper modified the milestones: 1.66.0, 1.65.0 Oct 4, 2022

cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 4, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Avoid duplicating StorageLive in let-else #101894

Avoid duplicating StorageLive in let-else #101894

dingxiangfei2009 commented Sep 16, 2022 •

edited

Loading

rust-highfive commented Sep 16, 2022

dingxiangfei2009 commented Sep 16, 2022

oli-obk commented Sep 16, 2022

Mark-Simulacrum commented Sep 16, 2022 •

edited

Loading

dingxiangfei2009 commented Sep 16, 2022

est31 commented Sep 17, 2022

dingxiangfei2009 commented Sep 18, 2022

RalfJung commented Sep 19, 2022

oli-obk commented Sep 19, 2022

bors commented Sep 19, 2022

RalfJung commented Sep 19, 2022

bors commented Sep 19, 2022

bors commented Sep 19, 2022

rust-timer commented Sep 19, 2022

apiraino commented Sep 22, 2022 •

edited

Loading

RalfJung commented Sep 22, 2022

Avoid duplicating StorageLive in let-else #101894

Avoid duplicating StorageLive in let-else #101894

Conversation

dingxiangfei2009 commented Sep 16, 2022 • edited Loading

rust-highfive commented Sep 16, 2022

dingxiangfei2009 commented Sep 16, 2022

oli-obk commented Sep 16, 2022

Mark-Simulacrum commented Sep 16, 2022 • edited Loading

dingxiangfei2009 commented Sep 16, 2022

est31 commented Sep 17, 2022

dingxiangfei2009 commented Sep 18, 2022

RalfJung commented Sep 19, 2022

oli-obk commented Sep 19, 2022

bors commented Sep 19, 2022

RalfJung commented Sep 19, 2022

bors commented Sep 19, 2022

bors commented Sep 19, 2022

rust-timer commented Sep 19, 2022

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

apiraino commented Sep 22, 2022 • edited Loading

RalfJung commented Sep 22, 2022

dingxiangfei2009 commented Sep 16, 2022 •

edited

Loading

Mark-Simulacrum commented Sep 16, 2022 •

edited

Loading

apiraino commented Sep 22, 2022 •

edited

Loading