[cxx-interop] Skip already-imported sub decls. #35964
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
Rather than skipping non-definitions, we should just check whether we've already seen this decl. This not only fixes the specific problem with class templates but also is a more general fix for other sub decls.
|
@swift-ci please smoke test. |
|
@swift-ci please test Windows platform. |
| @@ -3371,6 +3371,11 @@ namespace { | |||
| } | |||
| } | |||
|
|
|||
| // If we've already imported this decl, skip it so we don't add the same | |||
| // member twice. | |||
| if (Impl.ImportedDecls.count({nd->getCanonicalDecl(), getVersion()})) | |||
There was a problem hiding this comment.
Nit: I think it would be more idiomatic to use find() != end() instead of count, until someone adds a contains_key method to upstream DenseMap.
There was a problem hiding this comment.
Will fix, thanks!
zoecarver
added a commit
to zoecarver/swift
that referenced
this pull request
Feb 16, 2021
Addresses the post commit review comment in swiftlang#35964 and replaces "count()" with "find() != end()".
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 skipping non-definitions, we should just check whether we've already seen this decl. This not only fixes the specific problem with class templates but also is a more general fix for other sub decls that might have this issue in the future (i.e., methods).