Extend operator decls to allow any designated nominal type for lookup. #19756
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
Rather than limiting this to protocols, allow any nominal type. Rename -enable-operator-designated-protocols to -enable-operator-designated-types to reflect the change.
|
@swift-ci Please smoke test |
xedin
approved these changes
Oct 8, 2018
lib/Sema/TypeCheckDecl.cpp
Outdated
| enableOperatorDesignatedProtocols) { | ||
| auto protocolIdLoc = OD->getDesignatedProtocolNameLoc(); | ||
| checkDesignatedProtocol(OD, protocolId, protocolIdLoc, *this, Context); | ||
| auto *protocol = OD->getDesignatedNominalType(); |
lib/Sema/TypeCheckDecl.cpp
Outdated
| @@ -2127,20 +2120,20 @@ void TypeChecker::validateDecl(OperatorDecl *OD) { | |||
| } | |||
|
|
|||
| auto secondId = IOD->getSecondIdentifier(); | |||
| auto *protocol = IOD->getDesignatedProtocol(); | |||
| if (!protocol && enableOperatorDesignatedProtocols) { | |||
| auto *protocol = IOD->getDesignatedNominalType(); | |||
lib/Serialization/Serialization.cpp
Outdated
| @@ -2878,7 +2878,7 @@ void Serializer::writeDecl(const Decl *D) { | |||
| auto contextID = addDeclContextRef(op->getDeclContext()); | |||
| auto nameID = addDeclBaseNameRef(op->getName()); | |||
| auto groupID = addDeclRef(op->getPrecedenceGroup()); | |||
| auto protoID = addDeclRef(op->getDesignatedProtocol()); | |||
| auto protoID = addDeclRef(op->getDesignatedNominalType()); | |||
There was a problem hiding this comment.
All of names here have to be nominalID?
|
@xedin Thanks for catching those. I have other edits to extend this further, but I've fixed up the naming prior to merging. |
|
@swift-ci Please smoke test |
gparker42
pushed a commit
that referenced
this pull request
Oct 10, 2018
gparker42
pushed a commit
that referenced
this pull request
Oct 10, 2018
…BE-61E65F8A7618 [test] Fix a solver flag rename that was missed in #19756.
modelorganism
pushed a commit
to modelorganism/swift
that referenced
this pull request
Oct 11, 2018
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.
Rather than limiting this to protocols, allow any nominal type.
Rename -enable-operator-designated-protocols to
-enable-operator-designated-types to reflect the change.