Skip to content

Fix two OOM issues related to ConstProp - #66394

Merged
bors merged 4 commits into
rust-lang:masterfrom
wesleywiser:fix_oom
Nov 17, 2019
Merged

Fix two OOM issues related to ConstProp#66394
bors merged 4 commits into
rust-lang:masterfrom
wesleywiser:fix_oom

Conversation

@wesleywiser

@wesleywiserwesleywiser commented Nov 14, 2019•
edited
Loading

Copy link
Copy Markdown
Member

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 14, 2019
@wesleywiserwesleywiser changed the title Fix spurious CI filures due to OOMFix two OOM issues related to ConstPropNov 14, 2019
wesleywiser
wesleywiser commented Nov 14, 2019
View reviewed changes
Comment threadsrc/librustc_mir/transform/const_prop.rs
Centril
Centril reviewed Nov 14, 2019
View reviewed changes
Comment threadsrc/test/ui/consts/issue-66342.rs
@pnkfelixpnkfelix added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 14, 2019
@oli-obk

oli-obk commented Nov 14, 2019

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Nov 14, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 0c52c3e has been approved by oli-obk

@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 Nov 14, 2019
@pnkfelixpnkfelix added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Nov 14, 2019
tmandry added a commit to tmandry/rust that referenced this pull request Nov 14, 2019
@tmandry
Rollup merge ofrust-lang#66394- wesleywiser:fix_oom, r=oli-obk
407968d
Fix two OOM issues related to `ConstProp`
Fixesrust-lang#66342Fixesrust-lang#66397
r? @oli-obk
@tmandrytmandry mentioned this pull request Nov 14, 2019
Closed
@kennytm

kennytm commented Nov 14, 2019

Copy link
Copy Markdown
Member

@bors r-

The two new test cases cause const evaluation error on 32-bit targets in #66417 (comment).

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 14, 2019
@kennytm

kennytm commented Nov 15, 2019

Copy link
Copy Markdown
Member

@bors r=oli-obk

@bors

bors commented Nov 15, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 3bd5226 has been approved by oli-obk

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 15, 2019
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Nov 15, 2019
@JohnTitor
Rollup merge ofrust-lang#66394- wesleywiser:fix_oom, r=oli-obk
4081586
Fix two OOM issues related to `ConstProp`
Fixesrust-lang#66342Fixesrust-lang#66397
r? @oli-obk
@JohnTitorJohnTitor mentioned this pull request Nov 15, 2019
Closed
bors added a commit that referenced this pull request Nov 15, 2019
@bors
Auto merge of#66436- JohnTitor:rollup-kphyb2i, r=JohnTitor
dac7229
Rollup of 12 pull requests
Successful merges:
- #65557 (rename Error::iter_chain() and remove Error::iter_sources())
- #66013 (Avoid hashing the key twice in `get_query()`.)
- #66306 (Remove cannot mutate statics in initializer of another static error)
- #66338 (Update mdbook.)
- #66388 (Do not ICE on recovery from unmet associated type bound obligation)
- #66390 (Fix ICE when trying to suggest `Type<>` instead of `Type()`)
- #66391 (Do not ICE in `if` without `else` in `async fn`)
- #66394 (Fix two OOM issues related to `ConstProp`)
- #66398 (Remove some stack frames from `.async` calls)
- #66410 (miri: helper methods for max values of machine's usize/isize)
- #66418 (Link to tracking issue in HIR const-check error code description)
- #66419 (Don't warn labels beginning with `_` on unused_labels lint)
Failed merges:
r? @ghost
@JohnTitor

JohnTitor commented Nov 15, 2019

Copy link
Copy Markdown
Member

Seems failed in #66436 (comment)
@bors r-

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 15, 2019
@wesleywiser

wesleywiser commented Nov 15, 2019

Copy link
Copy Markdown
MemberAuthor

@bors r=oli-obk

@bors

bors commented Nov 15, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit fd2595dbd29db8573c8a83c43ceda1b0002b235e has been approved by oli-obk

@bors

bors commented Nov 16, 2019

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-azure

@rust-highfive

This comment has been minimized.

Sign in to view
@borsbors 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 Nov 16, 2019
@wesleywiser

This comment has been minimized.

Sign in to view
@JohnTitor

JohnTitor commented Nov 16, 2019

Copy link
Copy Markdown
Member

@wesleywiser I noticed it's the wrong command.

@bors r=oli-obk

@bors

bors commented Nov 16, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 2dea8af has been approved by oli-obk

@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 Nov 16, 2019
@bors

bors commented Nov 16, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 2dea8af with merge 2cdc289...

bors added a commit that referenced this pull request Nov 16, 2019
@bors
Auto merge of#66394- wesleywiser:fix_oom, r=oli-obk
2cdc289
Fix two OOM issues related to `ConstProp`
Fixes#66342Fixes#66397
r? @oli-obk
@bors

bors commented Nov 17, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: oli-obk
Pushing 2cdc289 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Nov 17, 2019
@bors
bors merged commit 2dea8af into rust-lang:masterNov 17, 2019
@pnkfelix

pnkfelix commented Nov 21, 2019

Copy link
Copy Markdown
Contributor

beta-accepted (last week, sorry for delay!)

@pnkfelixpnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 21, 2019
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Dec 5, 2019
Merged
@Mark-SimulacrumMark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Dec 6, 2019
bors added a commit that referenced this pull request Dec 7, 2019
@bors
Auto merge of#67063- Mark-Simulacrum:beta-backports, r=Mark-Simulacrum
3f7f341
[beta] backports
This pull request backports the following pull requests, which have all been beta-accepted by the
compiler team.
* Handle non_exhaustive in borrow checking #66722
* Do not ICE on trait aliases with missing obligations #66392
* Do not ICE in `if` without `else` in `async fn` #66391
* Fix ICE when trying to suggest `Type<>` instead of `Type()` #66390
* Do not ICE on recovery from unmet associated type bound obligation #66388
* find_deprecation: deprecation attr may be ill-formed meta. #66381
* parser: don't use `unreachable!()` in `fn unexpected`. #66361
* Undo an assert causing an ICE until we fix the underlying problem #66250
* Do not ICE with a precision flag in formatting str and no format arguments #66093
* Fix two OOM issues related to `ConstProp` #66394
bors added a commit that referenced this pull request Dec 8, 2019
@bors
Auto merge of#67063- Mark-Simulacrum:beta-backports, r=Mark-Simulacrum
b509d9b
[beta] backports
This pull request backports the following pull requests, which have all been beta-accepted by the
compiler team.
* Handle non_exhaustive in borrow checking #66722
* Do not ICE on trait aliases with missing obligations #66392
* Do not ICE in `if` without `else` in `async fn` #66391
* Fix ICE when trying to suggest `Type<>` instead of `Type()` #66390
* Do not ICE on recovery from unmet associated type bound obligation #66388
* find_deprecation: deprecation attr may be ill-formed meta. #66381
* parser: don't use `unreachable!()` in `fn unexpected`. #66361
* Undo an assert causing an ICE until we fix the underlying problem #66250
* Do not ICE with a precision flag in formatting str and no format arguments #66093
* Fix two OOM issues related to `ConstProp` #66394
@wesleywiserwesleywiser mentioned this pull request Dec 22, 2019
Closed
dekellum added a commit to dekellum/hyperx that referenced this pull request May 23, 2021
@dekellum
use rustc 1.41.1 for windows CI
59c22e4
On windows-latest and rustc 1.39.0 we are seeing something related to
what was fixed here:
rust-lang/rust#66394
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers
@gilescopegilescopegilescope left review comments
@CentrilCentrilCentril left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@oli-obkoli-obk

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Large locals can cause OOMs during the ConstProp pass Spurious x86_64 Windows CI failures due to OOM

11 participants

@wesleywiser@oli-obk@bors@kennytm@JohnTitor@ecstatic-morse@Centril@rust-highfive@pnkfelix@gilescope@Mark-Simulacrum