Fix for memory leak when partially applying function with @autoreleased return value #1967
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
|
@swift-ci Please test |
|
@jckarter and @jrose-apple Do you mind reviewing this? |
|
Your test case doesn't have any partial application in it, does it? |
|
Unfortunately, it does. Dynamic method calls look up the method, partially apply self, wrap it in an optional, then destructure the optional :) |
|
I guess I should cook up a SILGen test, though... |
|
@slavapestov do you plan on incorporating a SILGen test into this pull request? |
|
@tkremenek That sounds like a good idea. I'll cook something up now. |
…d, convert @autoreleased result to @owned In IRGen, @autoreleased return values are always converted to +1 by calling objc_retainAutoreleasedReturnValue(), so a partial application thunk cannot have a result with @autoreleased convention. Just turn it into @owned instead, since that's what it is, using similar logic as the @unowned_inner_pointer => @unowned case. Fixes <rdar://problem/24805609>.
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.
slavapestov
force-pushed
the
partial-apply-fix-2.2
branch
from
c323ccd to
2d29049
Compare
|
@swift-ci Please test |
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.
This is a backport of the fix for rdar://problem/24805609 to Swift 2.2.