Skip to content

Disable RemoveZsts in generators to avoid query cycles - #88979

Merged
bors merged 1 commit into
rust-lang:masterfrom
tmiasko:no-remove-zsts-in-generators
Sep 16, 2021
Merged

Disable RemoveZsts in generators to avoid query cycles#88979
bors merged 1 commit into
rust-lang:masterfrom
tmiasko:no-remove-zsts-in-generators

Conversation

@tmiasko

Copy link
Copy Markdown
Contributor

Querying layout of a generator requires its optimized MIR. Thus
computing layout during MIR optimization of a generator might create a
query cycle. Disable RemoveZsts in generators to avoid the issue
(similar approach is used in ConstProp transform already).

Fixes#88972.

Querying layout of a generator requires its optimized MIR. Thus
computing layout during MIR optimization of a generator might create a
query cycle. Disable RemoveZsts in generators to avoid the issue
(similar approach is used in ConstProp transform already).
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @jackh726

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 15, 2021
@Mark-SimulacrumMark-Simulacrum added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 15, 2021
@Mark-Simulacrum

Copy link
Copy Markdown
Member

beta-nominating -- needed to fix #88972, which is a beta regression

@oli-obk

Copy link
Copy Markdown
Contributor

r? @oli-obk

@bors r+

@bors

bors commented Sep 15, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit c39d759 has been approved by oli-obk

@bors

bors commented Sep 15, 2021

Copy link
Copy Markdown
Collaborator

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@borsbors 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 15, 2021
@jackh726

Copy link
Copy Markdown
Member

r? @oli-obk

didn't seem to get picked up before

Manishearth added a commit to Manishearth/rust that referenced this pull request Sep 16, 2021
…s, r=oli-obk
Disable RemoveZsts in generators to avoid query cycles
Querying layout of a generator requires its optimized MIR. Thus
computing layout during MIR optimization of a generator might create a
query cycle. Disable RemoveZsts in generators to avoid the issue
(similar approach is used in ConstProp transform already).
Fixesrust-lang#88972.
@wesleywiser

Copy link
Copy Markdown
Member

Bumping priority since this fixes a stable-to-beta regression.

@bors p=1

@apirainoapiraino added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 16, 2021
@bors

bors commented Sep 16, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c39d759 with merge 237bb5e...

@bors

bors commented Sep 16, 2021

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 16, 2021
@bors
bors merged commit 237bb5e into rust-lang:masterSep 16, 2021
@rustbotrustbot added this to the 1.57.0 milestone Sep 16, 2021
@tmiasko
tmiasko deleted the no-remove-zsts-in-generators branch September 16, 2021 20:35
@apiraino

Copy link
Copy Markdown
Contributor

Beta backport accepted as per compiler team on Zulip

@rustbot label +beta-accepted

@rustbotrustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Sep 23, 2021
ehuss pushed a commit to ehuss/rust that referenced this pull request Oct 4, 2021
… r=oli-obk
Disable RemoveZsts in generators to avoid query cycles
Querying layout of a generator requires its optimized MIR. Thus
computing layout during MIR optimization of a generator might create a
query cycle. Disable RemoveZsts in generators to avoid the issue
(similar approach is used in ConstProp transform already).
Fixesrust-lang#88972.
@ehussehuss mentioned this pull request Oct 4, 2021
@ehussehuss removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 4, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 4, 2021
[beta] Beta rollup
* Fix WinUWP std compilation errors due to I/O safety rust-lang#88587
* Disable RemoveZsts in generators to avoid query cycles rust-lang#88979
* Disable the evaluation cache when in intercrate mode rust-lang#88994
* Fix linting when trailing macro expands to a trailing semi rust-lang#88996
* Don't use projection cache or candidate cache in intercrate mode rust-lang#89125
* 2229: Mark insignificant dtor in stdlib rust-lang#89144
* Temporarily rename int_roundings functions to avoid conflicts rust-lang#89184
* [rfc 2229] Drop fully captured upvars in the same order as the regular drop code rust-lang#89208
* Use the correct edition for syntax highlighting doctests rust-lang#89277
* Don't normalize opaque types with escaping late-bound regions rust-lang#89285
* Update Let's Encrypt ROOT CA certificate in dist-(i686|x86_64)-linux docker images rust-lang#89486
Cargo update:
* - [beta] 1.56 backports (rust-lang/cargo#9958)
* - [beta] Revert "When a dependency does not have a version, git or path… (rust-lang/cargo#9912)
* - [beta] Fix rustc --profile=dev unstable check. (rust-lang/cargo#9901)
@Mark-SimulacrumMark-Simulacrum modified the milestones: 1.57.0, 1.56.0Oct 6, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

regression: cycle in MIR opts

10 participants

@tmiasko@rust-highfive@Mark-Simulacrum@oli-obk@bors@jackh726@wesleywiser@apiraino@ehuss@rustbot