Allow stored properties in extensions #61593
Closed
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
slavapestov
reviewed
Oct 17, 2022
| if (isStoredPropertyInitializer()) | ||
| decl = cast<NominalTypeDecl>(decl->getDeclContext()); | ||
| if (isStoredPropertyInitializer()) { | ||
| if (auto extension = dyn_cast<ExtensionDecl>(decl->getDeclContext())) { |
Contributor
There was a problem hiding this comment.
decl->getDeclContext()->getSelfNominalTypeDecl()
Contributor
Author
There was a problem hiding this comment.
aha very helpful, thanks!
| if (isStoredPropertyInitializer() || (isPropertyWrapperBackingInitializer() && | ||
| d->getDeclContext()->isTypeContext())) { | ||
| auto *nominal = cast<NominalTypeDecl>(d->getDeclContext()); | ||
| NominalTypeDecl *nominal; |
| // Stored properties in extensions within the same file are added | ||
| // as members to the defining type, so we shouldn't assert in that | ||
| // case | ||
| || DC->getContextKind() == DeclContextKind::ExtensionDecl); |
Contributor
There was a problem hiding this comment.
DC->getSelfNominalTypeDecl() == TheStruct->getAnyNominal()
| // Stored properties in extensions within the same file are | ||
| // added as members to the defining type, so we shouldn't assert | ||
| // in that case | ||
| || DC->getContextKind() == DeclContextKind::ExtensionDecl, |
| NominalTypeDecl *nominal) { | ||
| auto subs = getSubstitutionsForPropertyInitializer(dc, nominal); | ||
|
|
||
| // open question: is there a good "ordered set" type we could use |
|
|
||
| if (auto *structDecl = dyn_cast<StructDecl>(field->getDeclContext())) { | ||
| NominalTypeDecl *nominal; | ||
| if (auto extension = dyn_cast<ExtensionDecl>(field->getDeclContext())) { |
| auto *varPattern = pbd->getPattern(i); | ||
| // A type can also have stored properties that aren't direct members, | ||
| // e.g. if they were defined in an extension. | ||
| for (auto storedProperty : nominal->getStoredProperties()) { |
Contributor
There was a problem hiding this comment.
Do you still need the first loop over the members?
| // Types can have stored properties that aren't included in | ||
| // `getABIMembers()`, so we have to handle those manually | ||
| for (VarDecl *VD : theType->getStoredProperties()) { | ||
| if (!visitedVarDecls.count(VD)) { |
Contributor
There was a problem hiding this comment.
Instead of using a set here, you can just skip stored properties in the first loop
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 proof-of-concept PR adds support for defining stored properties in extensions, as long as the extension is defined in the same file as the type being extended. For example:
Here's a pitch thread on the Evolution forums for this change: Allow stored properties in extensions