-
Notifications
You must be signed in to change notification settings - Fork 10.5k
Import Forward Declared Objective-C Interfaces and Protocols #61606
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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 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 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 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 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 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -597,6 +597,7 @@ ModuleDecl::ModuleDecl(Identifier name, ASTContext &ctx, | |
Bits.ModuleDecl.HasIncrementalInfo = 0; | ||
Bits.ModuleDecl.HasHermeticSealAtLink = 0; | ||
Bits.ModuleDecl.IsConcurrencyChecked = 0; | ||
Bits.ModuleDecl.ObjCNameLookupCachePopulated = 0; | ||
} | ||
|
||
ImplicitImportList ModuleDecl::getImplicitImports() const { | ||
|
@@ -1176,6 +1177,60 @@ void ModuleDecl::getTopLevelDeclsWhereAttributesMatch( | |
FORWARD(getTopLevelDeclsWhereAttributesMatch, (Results, matchAttributes)); | ||
} | ||
|
||
void ModuleDecl::lookupTopLevelDeclsByObjCName(SmallVectorImpl<Decl *> &Results, | ||
DeclName name) { | ||
if (!isObjCNameLookupCachePopulated()) | ||
populateObjCNameLookupCache(); | ||
|
||
// A top level decl can't be special anyways | ||
if (name.isSpecial()) | ||
NuriAmari marked this conversation as resolved.
Show resolved
Hide resolved
|
||
return; | ||
|
||
auto resultsForFileUnit = ObjCNameLookupCache.find(name.getBaseIdentifier()); | ||
if (resultsForFileUnit == ObjCNameLookupCache.end()) | ||
return; | ||
|
||
Results.append(resultsForFileUnit->second.begin(), | ||
resultsForFileUnit->second.end()); | ||
} | ||
|
||
void ModuleDecl::populateObjCNameLookupCache() { | ||
SmallVector<Decl *> topLevelObjCExposedDeclsInFileUnit; | ||
auto hasObjCAttrNamePredicate = [](const DeclAttributes &attrs) -> bool { | ||
return attrs.hasAttribute<ObjCAttr>(); | ||
}; | ||
|
||
for (FileUnit *file : getFiles()) { | ||
file->getTopLevelDeclsWhereAttributesMatch( | ||
topLevelObjCExposedDeclsInFileUnit, hasObjCAttrNamePredicate); | ||
if (auto *synth = file->getSynthesizedFile()) { | ||
synth->getTopLevelDeclsWhereAttributesMatch( | ||
topLevelObjCExposedDeclsInFileUnit, hasObjCAttrNamePredicate); | ||
} | ||
} | ||
|
||
for (Decl *decl : topLevelObjCExposedDeclsInFileUnit) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could |
||
if (ValueDecl *VD = dyn_cast<ValueDecl>(decl); VD && VD->hasName()) { | ||
const auto &declObjCAttribute = VD->getAttrs().getAttribute<ObjCAttr>(); | ||
// No top level decl (class, protocol, extension etc.) is allowed to have a | ||
// compound name, @objc provided or otherwise. Global functions are allowed to | ||
// have compound names, but not allowed to have @objc attributes. Thus we | ||
// are sure to not hit asserts getting the simple name. | ||
// | ||
// Similarly, init, dealloc and subscript (the special names) can't be top | ||
// level decls, so we won't hit asserts getting the base identifier out of the | ||
// value decl. | ||
const Identifier &declObjCName = | ||
declObjCAttribute->hasName() | ||
? declObjCAttribute->getName()->getSimpleName() | ||
: VD->getName().getBaseIdentifier(); | ||
ObjCNameLookupCache[declObjCName].push_back(decl); | ||
} | ||
} | ||
|
||
setIsObjCNameLookupCachePopulated(true); | ||
} | ||
|
||
void SourceFile::getTopLevelDecls(SmallVectorImpl<Decl*> &Results) const { | ||
auto decls = getTopLevelDecls(); | ||
Results.append(decls.begin(), decls.end()); | ||
|
@@ -3347,6 +3402,9 @@ bool SourceFile::shouldCrossImport() const { | |
void ModuleDecl::clearLookupCache() { | ||
getASTContext().getImportCache().clear(); | ||
|
||
setIsObjCNameLookupCachePopulated(false); | ||
ObjCNameLookupCache.clear(); | ||
|
||
if (!Cache) | ||
return; | ||
|
||
|
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.