Const to op simplification by oli-obk · Pull Request #58511 · rust-lang/rust

oli-obk · 2019-02-16T12:45:18Z

r? @RalfJung

alternative to #58486

…variants

…se sites

src/librustc/mir/interpret/value.rs

RalfJung · 2019-02-16T13:33:26Z

I love this. :)

r=me with the nit fixed.

However, there are other parts of #58486 that are still viable, right? Like, some of the simplifications in const_eval?

RalfJung · 2019-02-16T13:39:06Z

Hm, I thought op_to_const could be removed/simplified, but having something like that makes sense. I guess the FIXME there can go away now?

It is a bit sad that we need the may_normalized: bool argument there. I think it would be clearer to rename that to force_indirect (with the opposite meaning of may_normalize), because that's really what this is about (for statics/promoteds, we need them to be ByRef). That could make the code clearer, and we could add some assertions to make sure the OpTy is really indirect.

src/librustc_mir/interpret/operand.rs

Co-Authored-By: oli-obk <github35764891676564198441@oli-obk.de>

RalfJung · 2019-02-16T14:40:33Z

Awesome. I love this PR. :)

@bors r+

bors · 2019-02-16T14:40:34Z

📌 Commit 1fe7eb0 has been approved by RalfJung

bors · 2019-02-16T14:40:39Z

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: Be more permissive with required bounds on existential types #57896

bors · 2019-02-16T14:40:40Z

📌 Commit 1fe7eb0 has been approved by RalfJung

@RalfJung

Const to op simplification r? @RalfJung alternative to rust-lang#58486

@RalfJung

Const to op simplification r? @RalfJung alternative to rust-lang#58486

@RalfJung

Const to op simplification r? @RalfJung alternative to rust-lang#58486

@RalfJung

Const to op simplification r? @RalfJung alternative to rust-lang#58486

@ghost

Rollup of 6 pull requests Successful merges: - #57364 (Improve parsing diagnostic for negative supertrait bounds) - #58183 (Clarify guarantees for `Box` allocation) - #58442 (Simplify the unix `Weak` functionality) - #58454 (Refactor Windows stdio and remove stdin double buffering ) - #58511 (Const to op simplification) - #58642 (rustdoc: support methods on primitives in intra-doc links) Failed merges: r? @ghost

oli-obk added 3 commits February 16, 2019 12:32

Expose const -> op functions that don't allow violiting const eval in…

235a6b7

…variants

Remove an intermediate value from discriminant reading

bd18cc5

Burn some invariants we keep up into code

b2bf37a

rust-highfive assigned RalfJung Feb 16, 2019

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

Reuse the Pointer type instead of passing reassembling it at many u…

f7c4931

…se sites

RalfJung reviewed Feb 16, 2019

View reviewed changes

src/librustc/mir/interpret/value.rs Show resolved Hide resolved

Reintroduce the invariant comment for clarity

7db96a3

RalfJung reviewed Feb 16, 2019

View reviewed changes

src/librustc_mir/interpret/operand.rs Outdated Show resolved Hide resolved

RalfJung reviewed Feb 16, 2019

View reviewed changes

src/librustc_mir/interpret/operand.rs Outdated Show resolved Hide resolved

RalfJung reviewed Feb 16, 2019

View reviewed changes

src/librustc_mir/interpret/operand.rs Outdated Show resolved Hide resolved

RalfJung and others added 6 commits February 16, 2019 14:52

Update src/librustc_mir/interpret/operand.rs

bee3c67

Co-Authored-By: oli-obk <github35764891676564198441@oli-obk.de>

Make validity checking use MPlaceTy instead of OpTy

525983a

Make may_normalize explicit in the type system

27e438a

Add eval prefix to clarify what the function does

4fdeb2d

Update docs and visibilities of const to op methods

4b08533

Limit the visibility further and expand on a comment

1fe7eb0

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 Feb 16, 2019

Centril added a commit to Centril/rust that referenced this pull request Feb 20, 2019

Rollup merge of rust-lang#58511 - oli-obk:const_to_op, r=RalfJung

a8722c2

Const to op simplification r? @RalfJung alternative to rust-lang#58486

Centril mentioned this pull request Feb 20, 2019

Rollup of 12 pull requests #58594

Closed

Centril added a commit to Centril/rust that referenced this pull request Feb 23, 2019

Rollup merge of rust-lang#58511 - oli-obk:const_to_op, r=RalfJung

89c4253

Const to op simplification r? @RalfJung alternative to rust-lang#58486

Centril mentioned this pull request Feb 23, 2019

Rollup of 16 pull requests #58664

Closed

Centril added a commit to Centril/rust that referenced this pull request Feb 24, 2019

Rollup merge of rust-lang#58511 - oli-obk:const_to_op, r=RalfJung

284787b

Const to op simplification r? @RalfJung alternative to rust-lang#58486

Centril mentioned this pull request Feb 24, 2019

Rollup of 6 pull requests #58688

Closed

Centril added a commit to Centril/rust that referenced this pull request Feb 24, 2019

Rollup merge of rust-lang#58511 - oli-obk:const_to_op, r=RalfJung

1082a29

Const to op simplification r? @RalfJung alternative to rust-lang#58486

Centril mentioned this pull request Feb 24, 2019

Rollup of 6 pull requests #58691

Merged

bors merged commit 1fe7eb0 into rust-lang:master Feb 24, 2019

RalfJung mentioned this pull request Feb 24, 2019

always back ty::Const by an Allocation #58486

Closed

matthewjasper mentioned this pull request Feb 25, 2019

panic with "Layout mismatch when copying!" #58742

Closed

oli-obk deleted the const_to_op branch March 16, 2021 12:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Const to op simplification#58511

Const to op simplification#58511
bors merged 11 commits intorust-lang:masterfrom
oli-obk:const_to_op

oli-obk commented Feb 16, 2019

Uh oh!

Uh oh!

RalfJung commented Feb 16, 2019

Uh oh!

RalfJung commented Feb 16, 2019 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

RalfJung commented Feb 16, 2019 •

edited

Loading

Uh oh!

bors commented Feb 16, 2019

Uh oh!

bors commented Feb 16, 2019

Uh oh!

bors commented Feb 16, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

oli-obk commented Feb 16, 2019

Uh oh!

Uh oh!

RalfJung commented Feb 16, 2019

Uh oh!

RalfJung commented Feb 16, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

RalfJung commented Feb 16, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Feb 16, 2019

Uh oh!

bors commented Feb 16, 2019

Uh oh!

bors commented Feb 16, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

RalfJung commented Feb 16, 2019 •

edited

Loading

RalfJung commented Feb 16, 2019 •

edited

Loading