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.

Sign up for GitHub

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

Jump to bottom

Shim intrinsics::atomic_singlethreadfence, etc. #1150

Merged
merged 2 commits into from
Jan 25, 2020
Merged

Shim intrinsics::atomic_singlethreadfence, etc. #1150

merged 2 commits into from
Jan 25, 2020

Conversation

divergentdave
Copy link
Contributor

This applies the no-op shim for atomic fences to atomic_singlethreadfence and related intrinsics.

@oli-obk
Copy link
Contributor

oli-obk commented Jan 25, 2020

Can these be triggered from code using just the libstd? If so, please add a test invoking some of them

@divergentdave
Copy link
Contributor Author

👍 tests added

@RalfJung
Copy link
Member

Thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Jan 25, 2020

📌 Commit 9265e0c has been approved by RalfJung

@bors
Copy link
Contributor

bors commented Jan 25, 2020

⌛ Testing commit 9265e0c with merge b222677...

bors added a commit that referenced this pull request Jan 25, 2020
@bors
Auto merge of #1150 - divergentdave:patch-1, r=RalfJung
b222677 
Shim intrinsics::atomic_singlethreadfence, etc.

This applies the no-op shim for atomic fences to `atomic_singlethreadfence` and related intrinsics.
@bors
Copy link
Contributor

bors commented Jan 25, 2020

☀️ Test successful - checks-travis, status-appveyor
Approved by: RalfJung
Pushing b222677 to master...

@bors bors merged commit 9265e0c into rust-lang:master Jan 25, 2020
@divergentdave divergentdave deleted the patch-1 branch January 25, 2020 20:43
@jonhoo
Copy link

jonhoo commented Jan 27, 2020

@RalfJung Can we submit a PR to get this into nightly? I would do it myself, but from memory last time it is easier if you are the owner of the PR in case further fixes are needed :)

@jonhoo jonhoo mentioned this pull request Jan 27, 2020
Merged
@oli-obk
Copy link
Contributor

oli-obk commented Jan 27, 2020

Since miri is still passing on rustc master, you should be able to just open a PR that bumps the submodule and ping ralf and me so one of us can send it off. Most of the time we just update when there's breakage, so you may have seen that?

@jonhoo
Copy link

jonhoo commented Jan 27, 2020

Will do! I just remember the experience from rust-lang/rust#65278 (which was also "just a bump"), and wanted to avoid repeating that :p

@jonhoo jonhoo mentioned this pull request Jan 27, 2020
Merged
@jonhoo
Copy link

jonhoo commented Jan 27, 2020

Done in rust-lang/rust#68576

bors pushed a commit to rust-lang/rust that referenced this pull request Jan 27, 2020
@jonhoo
Bump miri for rust-lang/miri#1150
9872407
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Jan 27, 2020
@Mark-Simulacrum
Rollup merge of rust-lang#68576 - jonhoo:bump-miri, r=oli-obk
69362b9 
update miri

Bump miri for rust-lang/miri#1150

r? @oli-obk
@jonhoo jonhoo mentioned this pull request Jan 29, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@divergentdave @oli-obk @RalfJung @bors @jonhoo