[C++-Interop] Fix EffectiveClangContext for NS_OPTIONS EnumDecl lookup. #59042
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
This patch fixes an issue with C++-Interop that has been making it so that enums under interop were not getting properly looked up and therefore not getting imported. The reason for this was that the proper DeclContext was not getting applied when grabbing the decls use by VisitDecls later in the ClangImporter. The lookup code at SwiftLookupTable::lookup is given a clang TU which is what implcitly gets turned into an EffectiveClangContext. The EffectiveClangContext is the piece that decides which DeclContext to use. In the case of an extern "C" (ie LinkageSpecDecl), the EffectiveClangContext was not traversing inside the lexical scope of the extern "C" as the context for searching the EnumDecl (the NS_OPTIONS Enum). This patch adds new behavior when EffectiveClangContext is given a LinkageSpecDecl. It sets the DeclContext to the lexical decl context. With this fix in place in the presence of C++-Interop we not only import the NS_OPTIONS typedef properly, but we also import the enum (and therefore the EnumConstants) correctly (which are used for getting to the flags for populating the NS_OPTIONS bitfields.
|
@swift-ci please test |
drodriguez
reviewed
May 26, 2022
| @@ -197,6 +198,8 @@ class EffectiveClangContext { | |||
| DC = omDecl->getCanonicalDecl(); | |||
| } else if (auto fDecl = dyn_cast<clang::FunctionDecl>(dc)) { | |||
| DC = fDecl->getCanonicalDecl(); | |||
| } else if (auto externCDecl = dyn_cast<clang::LinkageSpecDecl>(dc)) { | |||
| DC = externCDecl->getLexicalDeclContext(); | |||
| } else { | |||
| assert(isa<clang::TranslationUnitDecl>(dc) || | |||
| isa<clang::LinkageSpecDecl>(dc) || | |||
There was a problem hiding this comment.
Minor: if we are editing around here, this line can be removed.
(sorry for reviewing late)
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.
This patch fixes an issue with C++-Interop that has been making it so
that enums under interop were not getting properly looked up and
therefore not getting imported. The reason for this was that the proper
DeclContext was not getting applied when grabbing the decls use by
VisitDecls later in the ClangImporter.
The lookup code at SwiftLookupTable::lookup is given a clang TU which is
what implcitly gets turned into an EffectiveClangContext. The
EffectiveClangContext is the piece that decides which DeclContext to
use. In the case of an extern "C" (ie LinkageSpecDecl), the
EffectiveClangContext was not traversing inside the lexical scope of the
extern "C" as the context for searching the EnumDecl (the NS_OPTIONS
Enum).
This patch adds new behavior when EffectiveClangContext is given a
LinkageSpecDecl. It sets the DeclContext to the lexical decl context.
With this fix in place in the presence of C++-Interop we not only import
the NS_OPTIONS typedef properly, but we also import the enum (and
therefore the EnumConstants) correctly (which are used for getting to
the flags for populating the NS_OPTIONS bitfields.