Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adjust for MemoryExtra being merged into Machine #2047

Merged
merged 2 commits into from
Apr 5, 2022

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Apr 3, 2022

The Miri side of rust-lang/rust#95620

@RalfJung RalfJung added the S-blocked-on-rust Status: Blocked on landing a Rust PR label Apr 3, 2022
@bors
Copy link
Collaborator

bors commented Apr 4, 2022

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

@RalfJung
Copy link
Member Author

RalfJung commented Apr 5, 2022

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 5, 2022

📌 Commit 0512b2a has been approved by RalfJung

@bors
Copy link
Collaborator

bors commented Apr 5, 2022

⌛ Testing commit 0512b2a with merge 955bacc...

@bors
Copy link
Collaborator

bors commented Apr 5, 2022

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing 955bacc to master...

@bors bors merged commit 955bacc into rust-lang:master Apr 5, 2022
@RalfJung RalfJung deleted the no-extras branch April 5, 2022 15:43
bors added a commit that referenced this pull request Jul 1, 2022
avoid copying thread manager state in data race detector

When doing #2047 I did not realize that there is some redundant state here that we can now remove from the data race detector.

Also this removes the vector clocks from the data race errors since those don't really help diagnose the problem.
bors added a commit that referenced this pull request Jul 2, 2022
avoid copying thread manager state in data race detector

When doing #2047 I did not realize that there is some redundant state here that we can now remove from the data race detector.

Also this removes the vector clocks from the data race errors since those don't really help diagnose the problem.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-blocked-on-rust Status: Blocked on landing a Rust PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants