Add MemoryExtra in InterpretCx constructor params#62158

pvdrz · 2019-06-26T18:15:28Z

This is to avoid modifying MemoryExtra inside InterpretCx after initialization. Related miri PR: rust-lang/miri#792

RalfJung · 2019-06-26T18:19:07Z

Please also change Machine trait in machine.rs to not require a Default bound for MemoryExtra.

pvdrz · 2019-06-26T18:28:53Z

Please also change Machine trait in machine.rs to not require a Default bound for MemoryExtra.

I believe this is still required for all the Memory initializations inside the compiler. Should I remove it then?

Edit: Here for example: https://github.com/rust-lang/rust/blob/0a7b9953672e1c5cedee029b288fdc1d7b794cc7/src/librustc_mir/const_eval.rs#L50

RalfJung · 2019-06-26T18:47:50Z

That code will still work fine because there we are using a concrete MemoryExtra that does implement Default.

But what the trait says is that anyone implementing the Machine interface must provide a MemoryExtra that implements Default. There is no reason left to require that.

src/librustc_mir/const_eval.rs

RalfJung

This looks great! r=me once Travis is green and with the nit fixed.

@bors delegate

pvdrz · 2019-06-26T21:45:49Z

r=@RalfJung

RalfJung · 2019-06-26T21:47:25Z

It would be @ bors r=RalfJung. Note the lack of a second @. ;)

@bors r+

bors · 2019-06-26T21:47:27Z

📌 Commit 74a9c6eefcfa6469fae9f76d023429c0cb619ead has been approved by RalfJung

bors · 2019-06-26T21:47:27Z

🌲 The tree is currently closed for pull requests below priority 999, this pull request will be tested once the tree is reopened

bors · 2019-06-26T21:47:29Z

💡 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: [CI] Rollup of 5 pull requests #62147

bors · 2019-06-26T21:47:30Z

📌 Commit 74a9c6eefcfa6469fae9f76d023429c0cb619ead has been approved by RalfJung.`

bors · 2019-06-26T21:47:31Z

🌲 The tree is currently closed for pull requests below priority 999, this pull request will be tested once the tree is reopened

bors · 2019-06-26T21:47:57Z

💡 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: [CI] Rollup of 5 pull requests #62147

bors · 2019-06-26T21:47:58Z

📌 Commit 74a9c6eefcfa6469fae9f76d023429c0cb619ead has been approved by RalfJung

bors · 2019-06-26T21:47:59Z

🌲 The tree is currently closed for pull requests below priority 999, this pull request will be tested once the tree is reopened

pvdrz · 2019-06-26T22:13:18Z

It would be @ bors r=RalfJung. Note the lack of a second @. ;)

@bors r+

Oh ok! Thank you!

bors · 2019-06-26T22:13:20Z

@christianpoveda: 🔑 Insufficient privileges: Not in reviewers

RalfJung · 2019-06-28T06:32:37Z

@bors rollup=never (breaks Miri)

@rust-lang/infra why does rollup- not work? That would be much more consistent with the rest of the syntax.

pvdrz · 2019-06-28T06:34:17Z

Remember that rust-lang/miri#792 needs these changes to work

RalfJung · 2019-06-28T06:35:03Z

I do. The thing is, we are about to branch off beta in less than a week, which means changes that break Miri cannot land. So once #62105 lands, we'll have to fold a Miri update into this PR.

RalfJung · 2019-06-28T21:27:07Z

Looks very much like the Miri update will land first, so let's avoid wasting CI time.

@bors r-

RalfJung · 2019-06-29T09:17:58Z

@christianpoveda okay the Miri PR landed, are you ready to update this one? I prepared the rustup branch in the Miri repository for you. The sequence of commands for you (assuming you checked out your local branch for this PR) should roughly be

git fetch origin
git rebase origin/master # this should just work without conflicts
git status # this should show a clean working dir!
cd src/tools/miri
git fetch origin
git reset --hard origin/rustup
cd ../../..
./x.py # updates Cargo.lock if needed
git commit -am "update miri"

RalfJung · 2019-06-29T14:40:09Z

Now how do I get rid of this "rollup=never" thing...

@bors rollup-

bors · 2019-07-01T10:15:04Z

☔ The latest upstream changes (presumably #62253) made this pull request unmergeable. Please resolve the merge conflicts.

RalfJung · 2019-07-01T11:02:12Z

@christianpoveda we got overtaken by another PR that also modifies Miri... can you do a rebase and do the submodule update again? I updated the rustup branch on the Miri side.

RalfJung · 2019-07-01T11:04:41Z

Alternatively, you can remove the miri-updating commit and we wait until Wednesday, when we get out of the "freeze" for tools.

pvdrz · 2019-07-01T14:26:14Z

Alternatively, you can remove the miri-updating commit and we wait until Wednesday, when we get out of the "freeze" for tools.

I will do this, it seems the better option right now
Edit: It is done, I'll wait until wednesday to see what's up

RalfJung · 2019-07-02T19:49:03Z

It's just 4h until it's Wednesday UTC, I feel confident this will not land fast enough to cause problems and I want to stop having to remember.^^

@bors r+

bors · 2019-07-02T19:49:04Z

📌 Commit e32b8eb has been approved by RalfJung

bors · 2019-07-04T03:17:11Z

☔ The latest upstream changes (presumably #62355) made this pull request unmergeable. Please resolve the merge conflicts.

RalfJung · 2019-07-04T07:50:47Z

@bors r+

bors · 2019-07-04T07:50:48Z

📌 Commit e45bbaf has been approved by RalfJung

@RalfJung

…=RalfJung Add MemoryExtra in InterpretCx constructor params This is to avoid modifying `MemoryExtra` inside `InterpretCx` after initialization. Related miri PR: rust-lang/miri#792 r? @RalfJung

@RalfJung

…=RalfJung Add MemoryExtra in InterpretCx constructor params This is to avoid modifying `MemoryExtra` inside `InterpretCx` after initialization. Related miri PR: rust-lang/miri#792 r? @RalfJung

@RalfJung

…=RalfJung Add MemoryExtra in InterpretCx constructor params This is to avoid modifying `MemoryExtra` inside `InterpretCx` after initialization. Related miri PR: rust-lang/miri#792 r? @RalfJung

@ghost

Rollup of 13 pull requests Successful merges: - #61545 (Implement another internal lints) - #62110 (Improve -Ztime-passes) - #62133 (Feature gate `rustc` attributes harder) - #62158 (Add MemoryExtra in InterpretCx constructor params) - #62168 (The (almost) culmination of HirIdification) - #62193 (Create async version of the dynamic-drop test) - #62369 (Remove `compile-pass` from compiletest) - #62380 (rustc_target: avoid negative register counts in the SysV x86_64 ABI.) - #62381 (Fix a typo in Write::write_vectored docs) - #62390 (Update README.md) - #62396 (remove Scalar::is_null_ptr) - #62406 (Lint on invalid values passed to x.py --warnings) - #62414 (Remove last use of mem::uninitialized in SGX) Failed merges: r? @ghost

rust-highfive assigned RalfJung Jun 26, 2019

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

pvdrz mentioned this pull request Jun 26, 2019

Initialize MemoryExtra with StdRng rust-lang/miri#792

Closed

RalfJung reviewed Jun 26, 2019

View reviewed changes

src/librustc_mir/const_eval.rs Outdated Show resolved Hide resolved

RalfJung approved these changes Jun 26, 2019

View reviewed changes

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 Jun 26, 2019

bors 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 Jun 28, 2019

Add MemoryExtra in InterpretCx constructor params

e475539

bors 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 Jul 1, 2019

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 2, 2019

bors 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 Jul 4, 2019

Fix merge conflicts

e45bbaf

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 4, 2019

Centril mentioned this pull request Jul 5, 2019

Rollup of 14 pull requests #62413

Closed

Centril mentioned this pull request Jul 5, 2019

Rollup of 14 pull requests #62418

Closed

Centril mentioned this pull request Jul 5, 2019

Rollup of 13 pull requests #62419

Merged

bors merged commit e45bbaf into rust-lang:master Jul 5, 2019

pvdrz deleted the ecx-memory-extra branch July 6, 2019 03:31

Uh oh!

Conversation

pvdrz commented Jun 26, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RalfJung commented Jun 26, 2019

Uh oh!

pvdrz commented Jun 26, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RalfJung commented Jun 26, 2019

Uh oh!

Uh oh!

RalfJung left a comment

Choose a reason for hiding this comment

Uh oh!

pvdrz commented Jun 26, 2019

Uh oh!

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

Uh oh!

Uh oh!

bors commented Jun 26, 2019

Uh oh!

bors commented Jun 26, 2019

Uh oh!

bors commented Jun 26, 2019

Uh oh!

bors commented Jun 26, 2019

Uh oh!

bors commented Jun 26, 2019

Uh oh!

bors commented Jun 26, 2019

Uh oh!

bors commented Jun 26, 2019

Uh oh!

bors commented Jun 26, 2019

Uh oh!

pvdrz commented Jun 26, 2019

Uh oh!

bors commented Jun 26, 2019

Uh oh!

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

Uh oh!

Uh oh!

pvdrz commented Jun 28, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RalfJung commented Jun 28, 2019

Uh oh!

RalfJung commented Jun 28, 2019

Uh oh!

RalfJung commented Jun 29, 2019

Uh oh!

RalfJung commented Jun 29, 2019

Uh oh!

bors commented Jul 1, 2019

Uh oh!

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

Uh oh!

Uh oh!

RalfJung commented Jul 1, 2019

Uh oh!

pvdrz commented Jul 1, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RalfJung commented Jul 2, 2019

Uh oh!

bors commented Jul 2, 2019

Uh oh!

bors commented Jul 4, 2019

Uh oh!

RalfJung commented Jul 4, 2019

Uh oh!

bors commented Jul 4, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

pvdrz commented Jun 26, 2019 •

edited

Loading

pvdrz commented Jun 26, 2019 •

edited

Loading

RalfJung commented Jun 26, 2019 •

edited

Loading

RalfJung commented Jun 28, 2019 •

edited

Loading

pvdrz commented Jun 28, 2019 •

edited

Loading

RalfJung commented Jul 1, 2019 •

edited

Loading

pvdrz commented Jul 1, 2019 •

edited

Loading