Skip to content

miri: Memory data revived, Hooks for stack frame push/pop#56094

Merged
bors merged 6 commits intorust-lang:masterfrom
RalfJung:memory-data-revived
Nov 27, 2018
Merged

miri: Memory data revived, Hooks for stack frame push/pop#56094
bors merged 6 commits intorust-lang:masterfrom
RalfJung:memory-data-revived

Conversation

@RalfJung
Copy link
Member

@RalfJung RalfJung commented Nov 20, 2018

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 20, 2018
oli-obk
oli-obk approved these changes Nov 20, 2018
View reviewed changes
@RalfJung
Copy link
Member Author

RalfJung commented Nov 20, 2018

@bors r=oli-obk

@bors
Copy link
Collaborator

bors commented Nov 20, 2018

📌 Commit 2c653db4e5f7a78060aff90f21efc09b9ef8b4af has been approved by oli-obk

@bors 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 Nov 20, 2018
@Aaron1011 Aaron1011 mentioned this pull request Nov 20, 2018
Closed
@bors
Copy link
Collaborator

bors commented Nov 20, 2018

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

@bors 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 Nov 20, 2018
@RalfJung RalfJung force-pushed the memory-data-revived branch from 2c653db to 446ece6 Compare November 21, 2018 08:42
@RalfJung
Copy link
Member Author

RalfJung commented Nov 21, 2018

Rebased.

@bors r=oli-obk

@bors
Copy link
Collaborator

bors commented Nov 21, 2018

📌 Commit 446ece6c97310c4bb47d72fec8a37b53b0bdbaff has been approved by oli-obk

@bors 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 Nov 21, 2018
@RalfJung RalfJung mentioned this pull request Nov 21, 2018
Closed
@bors

This comment has been minimized.

Sign in to view
@bors 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 Nov 23, 2018
@RalfJung RalfJung force-pushed the memory-data-revived branch from 446ece6 to 2cf2074 Compare November 23, 2018 08:02
@RalfJung
Copy link
Member Author

RalfJung commented Nov 23, 2018

Rebased.

@bors r=oli-obk

@bors
Copy link
Collaborator

bors commented Nov 23, 2018

📌 Commit 2cf20742e55639d438ca3aacd16d2ecadd39fb7c has been approved by oli-obk

@bors 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 Nov 23, 2018
@bors

This comment has been minimized.

Sign in to view
@bors 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 Nov 23, 2018
@RalfJung RalfJung force-pushed the memory-data-revived branch from 2cf2074 to 4f95088 Compare November 24, 2018 09:24
@RalfJung
Copy link
Member Author

RalfJung commented Nov 24, 2018

Rebased (3rd time).

@bors r=oli-obk

@bors
Copy link
Collaborator

bors commented Nov 24, 2018

📌 Commit 4f95088fbba5d8cfee20be8cdaa7a781f3bdb1bc has been approved by oli-obk

@bors 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 Nov 24, 2018
@bors

This comment has been minimized.

Sign in to view
@bors 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 Nov 25, 2018
@RalfJung RalfJung force-pushed the memory-data-revived branch from 4f95088 to 349271a Compare November 25, 2018 09:54
@RalfJung
Copy link
Member Author

RalfJung commented Nov 25, 2018

Rebased (4th time).

@bors r=oli-obk

@bors
Copy link
Collaborator

bors commented Nov 25, 2018

📌 Commit 349271a has been approved by oli-obk

@bors 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 Nov 25, 2018
@bors
Copy link
Collaborator

bors commented Nov 27, 2018

⌛ Testing commit 349271a with merge 691a7f8...

bors added a commit that referenced this pull request Nov 27, 2018
@bors
Auto merge of #56094 - RalfJung:memory-data-revived, r=oli-obk
691a7f8 
miri: Memory data revived, Hooks for stack frame push/pop

r? @oli-obk
@bors
Copy link
Collaborator

bors commented Nov 27, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing 691a7f8 to master...

@bors bors merged commit 349271a into rust-lang:master Nov 27, 2018
@rust-highfive
Copy link
Contributor

rust-highfive commented Nov 27, 2018

📣 Toolstate changed by #56094!

Tested on commit 691a7f8.
Direct link to PR: #56094

💔 miri on windows: test-pass → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Nov 27, 2018
@rust-highfive
📣 Toolstate changed by rust-lang/rust#56094!
2fc329f 
Tested on commit rust-lang/rust@691a7f8.
Direct link to PR: <rust-lang/rust#56094>

💔 miri on windows: test-pass → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
@kennytm
Copy link
Member

kennytm commented Nov 27, 2018 

[01:27:33] error[E0107]: wrong number of type arguments: expected 2, found 1
[01:27:33]    --> src/tools/miri/src/stacked_borrows.rs:362:6
[01:27:33]     |
[01:27:33] 362 | impl AllocationExtra<Borrow> for Stacks {
[01:27:33]     |      ^^^^^^^^^^^^^^^^^^^^^^^ expected 2 type arguments
[01:27:33] 
[01:27:33] error: aborting due to previous error

@RalfJung RalfJung deleted the memory-data-revived branch November 30, 2018 08:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obk oli-obk oli-obk approved these changes

Assignees

@oli-obk oli-obk

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@RalfJung @bors @rust-highfive @kennytm @oli-obk