averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[NFC] Allow extensions in SynthesizedFileUnits

Browse Source
This commit is contained in:
Becca Royal-Gordon
2021-09-30 15:13:55 -07:00
parent 354f3470a0
commit fa8436bdf6
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/swift/AST/SynthesizedFileUnit.h
View File

@@ -28,7 +28,7 @@ class SynthesizedFileUnit final : public FileUnit {
SourceFile &SF;
/// Synthesized top level declarations.
TinyPtrVector<ValueDecl *> TopLevelDecls;
TinyPtrVector<Decl *> TopLevelDecls;
/// A unique identifier representing this file; used to mark private decls
/// within the file to keep them from conflicting with other files in the
@@ -43,7 +43,7 @@ public:
SourceFile &getSourceFile() const { return SF; }
/// Add a synthesized top-level declaration.
void addTopLevelDecl(ValueDecl *D) { TopLevelDecls.push_back(D); }
void addTopLevelDecl(Decl *D) { TopLevelDecls.push_back(D); }
virtual void lookupValue(DeclName name, NLKind lookupKind,
SmallVectorImpl<ValueDecl *> &result) const override;
@@ -56,7 +56,7 @@ public:
void getTopLevelDecls(SmallVectorImpl<Decl*> &results) const override;
ArrayRef<ValueDecl *> getTopLevelDecls() const {
ArrayRef<Decl *> getTopLevelDecls() const {
return TopLevelDecls;
};

7
lib/AST/Module.cpp
View File

@@ -2996,8 +2996,11 @@ void SynthesizedFileUnit::lookupValue(
DeclName name, NLKind lookupKind,
SmallVectorImpl<ValueDecl *> &result) const {
for (auto *decl : TopLevelDecls) {
if (decl->getName().matchesRef(name))
result.push_back(decl);
if (auto VD = dyn_cast<ValueDecl>(decl)) {
if (VD->getName().matchesRef(name)) {
result.push_back(VD);
}
}
}
}