Skip to content

Refactor eval_body_using_ecx so that it doesn't need to query for MIR - #60428

Merged
bors merged 1 commit into
rust-lang:masterfrom
wesleywiser:refactor_const_eval
May 2, 2019
Merged

Refactor eval_body_using_ecx so that it doesn't need to query for MIR#60428
bors merged 1 commit into
rust-lang:masterfrom
wesleywiser:refactor_const_eval

Conversation

@wesleywiser

Copy link
Copy Markdown
Member

This is the first step toward removing the mir field of ConstPropagator which will eventually allow us to actually const propagate in MIR.

r? @oli-obk

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 30, 2019
Comment threadsrc/librustc_mir/const_eval.rs Outdated
Comment threadsrc/librustc_mir/const_eval.rs Outdated
@wesleywiser
wesleywiserforce-pushed the refactor_const_eval branch from 1c2b5d2 to 04609a5CompareMay 1, 2019 12:12
@wesleywiser

Copy link
Copy Markdown
MemberAuthor

@oli-obk Done

@oli-obk

Copy link
Copy Markdown
Contributor

Huh. Doesn't this also require changes at the call site to eval_promoted? I thought right now it's passing in the function's MIR and not the promoted MIR

@wesleywiser
wesleywiserforce-pushed the refactor_const_eval branch from 04609a5 to eadf48eCompareMay 1, 2019 12:27
@wesleywiser

Copy link
Copy Markdown
MemberAuthor

Ah yes, I accidentally put that in a later commit.

@oli-obk

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented May 1, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit eadf48e 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 May 1, 2019
@wesleywiserwesleywiser mentioned this pull request May 1, 2019
Centril added a commit to Centril/rust that referenced this pull request May 1, 2019
…oli-obk
Refactor `eval_body_using_ecx` so that it doesn't need to query for MIR
This is the first step toward removing the `mir` field of `ConstPropagator` which will eventually allow us to actually const propagate in MIR.
r? @oli-obk
@CentrilCentril mentioned this pull request May 1, 2019
bors added a commit that referenced this pull request May 2, 2019
Rollup of 7 pull requests
Successful merges:
- #59634 (Added an explanation for the E0704 error.)
- #60348 (move some functions from parser.rs to diagostics.rs)
- #60385 (Emit metadata files earlier)
- #60428 (Refactor `eval_body_using_ecx` so that it doesn't need to query for MIR)
- #60437 (Ensure that drop order of `async fn` matches `fn` and that users cannot refer to generated arguments.)
- #60439 (doc: Warn about possible zombie apocalypse)
- #60452 (Remove Context and ContextKind)
Failed merges:
r? @ghost
@bors
bors merged commit eadf48e into rust-lang:masterMay 2, 2019
Centril added a commit to Centril/rust that referenced this pull request May 2, 2019
… r=oli-obk
Const prop refactoring
This is rebased on top of rust-lang#60428 so only the top commit is new.
This is the refactoring to remove the `mir` field from `ConstPropagator` which is necessary before we can begin to actually propagate constants.
r? @oli-obk
Centril added a commit to Centril/rust that referenced this pull request May 3, 2019
… r=oli-obk
Const prop refactoring
This is rebased on top of rust-lang#60428 so only the top commit is new.
This is the refactoring to remove the `mir` field from `ConstPropagator` which is necessary before we can begin to actually propagate constants.
r? @oli-obk
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@wesleywiser@oli-obk@bors@rust-highfive