-
Notifications
You must be signed in to change notification settings - Fork 472
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
epoch: Fix stacked borrows violations #871
Open
taiki-e
wants to merge
1
commit into
master
Choose a base branch
from
epoch-fix-sb-violations
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
taiki-e
force-pushed
the
epoch-fix-sb-violations
branch
from
July 20, 2022 16:30
fcafef5
to
8e29940
Compare
taiki-e
force-pushed
the
epoch-fix-sb-violations
branch
3 times, most recently
from
July 22, 2022 15:24
f25a4cd
to
a81e099
Compare
taiki-e
force-pushed
the
epoch-fix-sb-violations
branch
from
July 22, 2022 16:54
a81e099
to
e7c8fbf
Compare
This was referenced Jul 22, 2022
taiki-e
force-pushed
the
epoch-fix-sb-violations
branch
from
July 22, 2022 18:14
e7c8fbf
to
86c1680
Compare
bors bot
added a commit
that referenced
this pull request
Jul 23, 2022
796: epoch: Remove ptr-to-int casts r=taiki-e a=taiki-e Use [this hack](rust-lang/miri#1866 (comment)) to fix compatibility issues with Miri (see #490 (comment) for details). Due to the #545, still not compatible with stacked borrows. This will be fixed by the subsequent PR (#871). Note: this is a breaking change because changes API of Pointable and Pointer traits Fixes #579 881: Remove deprecated items r=taiki-e a=taiki-e This removes the following deprecated items: - crossbeam-epoch: - `CompareAndSetError` - `CompareAndSetOrdering` - `Atomic::compare_and_set` - `Atomic::compare_and_set_weak` - crossbeam-utils: - `AtomicCell::compare_and_swap` Co-authored-by: Taiki Endo <[email protected]>
bors bot
added a commit
that referenced
this pull request
Jul 23, 2022
796: epoch: Remove ptr-to-int casts r=taiki-e a=taiki-e Use [this hack](rust-lang/miri#1866 (comment)) to fix compatibility issues with Miri (see #490 (comment) for details). Due to the #545, still not compatible with stacked borrows. This will be fixed by the subsequent PR (#871). Note: this is a breaking change because changes API of Pointable and Pointer traits Fixes #579 Co-authored-by: Taiki Endo <[email protected]>
taiki-e
force-pushed
the
epoch-fix-sb-violations
branch
from
July 23, 2022 08:50
86c1680
to
525ae4f
Compare
taiki-e
force-pushed
the
epoch-fix-sb-violations
branch
2 times, most recently
from
July 23, 2022 12:06
a8485b4
to
f93970c
Compare
taiki-e
force-pushed
the
epoch-fix-sb-violations
branch
from
September 23, 2022 10:23
f93970c
to
9d1ebd2
Compare
taiki-e
force-pushed
the
epoch-fix-sb-violations
branch
from
November 20, 2022 08:04
48e0dfd
to
be5bcc4
Compare
taiki-e
commented
Nov 20, 2022
/// - `ptr` should not be mutably dereferenced by [`Pointable::deref_mut`] concurrently. | ||
unsafe fn deref<'a>(ptr: *mut ()) -> &'a Self; | ||
/// - `ptr` should not be mutably dereferenced by [`Pointable::as_mut_ptr`] concurrently. | ||
unsafe fn as_ptr(ptr: *mut ()) -> *const Self; | ||
|
||
/// Mutably dereferences the given pointer. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is no longer a dereference, but I'm not sure what is a good API name and description.
taiki-e
force-pushed
the
epoch-fix-sb-violations
branch
from
December 16, 2022 13:41
be5bcc4
to
87eecad
Compare
taiki-e
force-pushed
the
epoch-fix-sb-violations
branch
from
December 27, 2022 14:43
87eecad
to
f0f7323
Compare
taiki-e
force-pushed
the
epoch-fix-sb-violations
branch
from
June 17, 2023 11:20
f0f7323
to
6bd2fda
Compare
(Given that Miri appears to be trying to move to TB in the long term, I don't see the need to rush to merge this.) |
taiki-e
force-pushed
the
epoch-fix-sb-violations
branch
from
June 17, 2023 13:11
6bd2fda
to
a3fec7d
Compare
taiki-e
force-pushed
the
epoch-fix-sb-violations
branch
2 times, most recently
from
December 23, 2023 20:11
df9c0ee
to
9b332ee
Compare
taiki-e
force-pushed
the
epoch-fix-sb-violations
branch
from
December 23, 2023 20:30
9b332ee
to
3b4893b
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #545
See #545 (comment) for the reported stacked borrows violations.
Note: this is a breaking change because changes API of Pointable trait