[Exclusivity] Merge scopes with nested conflicts #19372
Merged
Conversation
This file contains hidden or 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
|
@atrick Can you please review? |
shajrawi
force-pushed
the
arrayinclass
branch
from
e35857c to
24b9b5b
Compare
|
@swift-ci Please test |
We can merge out-of-scope regardless of having a conflict within a scope i.e. begin_access %x end_access %x begin_access %x conflict end_access %x can be merged (same for the same scopes in reverse order) We can always do so unless there's a conflict between the first end_access and the second begin_access
shajrawi
force-pushed
the
arrayinclass
branch
from
24b9b5b to
43efed3
Compare
|
Updated the documentation based on @atrick's offline review |
|
@swift-ci Please smoke test and merge |
atrick
reviewed
Sep 21, 2018
| // NOTE: What we really want to do here is to check if | ||
| // we should add the new beginAccess to 'mergePairs' structure | ||
| // the reason for calling this method is to check for that. | ||
| // logically, we only need to add an instructio to |
There was a problem hiding this comment.
Minor typos. Can be fixed now or post-commit.
Otherwise seems ok.
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.
We can merge out-of-scope regardless of having a conflict within a scope
i.e.
begin_access %x
end_access %x
begin_access %x
conflict
end_access %x
can be merged (same for the same scopes in reverse order)
We can always do so unless there's a conflict between the first end_access and the second begin_access
Improves performance by over 26x on array in class benchmark (as one example) - back to (almost) same performance as without exclusivity
radar rdar://problem/44397786