[Concurrency] Fix ObjC weak references to actors. #42219
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
DougGregor
approved these changes
Apr 6, 2022
| // Test that instances of Swift actors can be referenced using ObjC | ||
| // weak references. | ||
|
|
||
| actor A { |
There was a problem hiding this comment.
You will probably need some SwiftStdlib 5.1 availability guards on these
There was a problem hiding this comment.
Good point. I should probably move this to a separate file too so we can put REQUIRES: concurrency only on this test.
| @@ -1208,8 +1208,8 @@ void DefaultActorImpl::deallocateUnconditional() { | |||
| if (JobStorageHeapObject.metadata != nullptr) | |||
| JobStorage.~ProcessInlineJob(); | |||
| auto metadata = cast<ClassMetadata>(this->metadata); | |||
| swift_deallocObject(this, metadata->getInstanceSize(), | |||
| metadata->getInstanceAlignMask()); | |||
| swift_deallocClassInstance(this, metadata->getInstanceSize(), | |||
There was a problem hiding this comment.
Well, that's subtle! Very good catch.
Change actor destruction to call swift_deallocClassInstance instead of swift_deallocObject. When ObjC interop is enabled, swift_deallocClassInstance will check the "pure swift deallocation" bit and call into the ObjC runtime to destruct the instance when needed. This is what clears weak references and associated objects. rdar://91270492
rokhinip
approved these changes
Apr 6, 2022
|
@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.
Change actor destruction to call swift_deallocClassInstance instead of swift_deallocObject. When ObjC interop is enabled, swift_deallocClassInstance will check the "pure swift deallocation" bit and call into the ObjC runtime to destruct the instance when needed. This is what clears weak references and associated objects.
rdar://91270492