partial_apply fixup #1767
Merged
partial_apply fixup #1767
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
...and give them a proper "REQUIRES: objc_interop" instead of "XFAIL: linux".
|
@swift-ci Please test |
We do clever tricks to avoid having to serialize the full type of a partial_apply instruction, but those conflicted with our clever tricks for handling unusual return conventions. Make sure we do all type calculations for partial_apply in one place. (Credit to Slava for both introducing the problem and immediately seeing how to fix it.) This should allow re-application of e6a519f and 86dcce1.
jrose-apple
force-pushed
the
partial_apply-fixup
branch
from
424e35a to
77265ed
Compare
|
For the record, this passed its tests. The only update was correcting the mentioned revisions in the commit message. |
|
Looks good @jrose-apple. A journey of removing a thousand duplicated lines of code begins with a single patch. |
jrose-apple
added a commit
that referenced
this pull request
Mar 22, 2016
We do clever tricks to avoid having to serialize the full type of a partial_apply instruction, but those conflicted with our clever tricks for handling unusual return conventions. Make sure we do all type calculations for partial_apply in one place.
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 do clever tricks to avoid having to serialize the full type of a
partial_applyinstruction, but those conflicted with our clever tricks for handling unusual return conventions. Make sure we do all type calculations forpartial_applyin one place. @slavapestov, does this look correct?This should allow re-application of e6a519f and 86dcce1.
Also, @rjmccall: is it just me (and Slava) or is this logic for
NS_RETURNS_INNER_POINTERnot sound at all? (This commit doesn't make that better or worse.)