[Name lookup] Deduplicate nominal declarations found via resolveTypeDeclsToNominal #26174
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
…eclsToNominal. Perform basic deduplication of the nominal type declarations found via resolveTypeDeclsToNominal(). Fixes rdar://problem/53164203
|
@swift-ci please smoke test |
xedin
approved these changes
Jul 17, 2019
jrose-apple
reviewed
Jul 17, 2019
| @@ -1734,12 +1734,17 @@ resolveTypeDeclsToNominal(Evaluator &evaluator, | |||
| SmallVectorImpl<ModuleDecl *> &modulesFound, | |||
| bool &anyObject, | |||
| llvm::SmallPtrSetImpl<TypeAliasDecl *> &typealiases) { | |||
| SmallPtrSet<NominalTypeDecl *, 4> knownNominalDecls; | |||
There was a problem hiding this comment.
Would SetVector<NominalTypeDecl *, TinyPtrVector<NominalTypeDecl *>, SmallPtrSet<NominalTypeDecl *, 4>> make this simpler or more complicated?
There was a problem hiding this comment.
That's clever to simplify it. Then I can use takeVector to steal its vector.
There was a problem hiding this comment.
Sigh.
error: no type named 'size_type' in 'llvm::TinyPtrVector<swift::NominalTypeDecl *>'
slavapestov
reviewed
Jul 17, 2019
| @@ -0,0 +1,8 @@ | |||
| @propertyWrapper | |||
| public struct Wrapper<Value> { | |||
| public var wrappedValue: Value | |||
There was a problem hiding this comment.
Ugh, annoying. I'll clean it up in a follow-up
DougGregor
added a commit
to DougGregor/swift
that referenced
this pull request
Jul 19, 2019
This was fixed by pull request swiftlang#26174, but the test case there was specific to property wrappers, while the fix also addresses issues with other ambiguity name lookups such as protocol names in an inheritance clause.
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.
Perform basic deduplication of the nominal type declarations found via
resolveTypeDeclsToNominal(). Fixes rdar://problem/53164203