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

Extend a few lookup APIs to use AbstractFunctionDecl instead of FuncDecl. NFC.

Browse Source 
This is required for upcoming changes in the devirtualizer.
This commit is contained in:
Roman Levenstein
2015-12-13 18:09:35 -08:00
parent 0880ddd6c7
commit 3a4184dad9
3 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/AST/Decl.cpp
View File

@@ -2378,10 +2378,11 @@ ArtificialMainKind ClassDecl::getArtificialMainKind() const {
llvm_unreachable("class has no @ApplicationMain attr?!");
}
FuncDecl *ClassDecl::findOverridingDecl(const FuncDecl *Method) const {
AbstractFunctionDecl *
ClassDecl::findOverridingDecl(const AbstractFunctionDecl *Method) const {
auto Members = getMembers();
for (auto M : Members) {
FuncDecl *CurMethod = dyn_cast<FuncDecl>(M);
AbstractFunctionDecl *CurMethod = dyn_cast<AbstractFunctionDecl>(M);
if (!CurMethod)
continue;
if (CurMethod->isOverridingDecl(Method)) {
@@ -2391,12 +2392,24 @@ FuncDecl *ClassDecl::findOverridingDecl(const FuncDecl *Method) const {
return nullptr;
}
FuncDecl * ClassDecl::findImplementingMethod(const FuncDecl *Method) const {
bool AbstractFunctionDecl::isOverridingDecl(
const AbstractFunctionDecl *Method) const {
const AbstractFunctionDecl *CurMethod = this;
while (CurMethod) {
if (CurMethod == Method)
return true;
CurMethod = CurMethod->getOverriddenDecl();
}
return false;
}
AbstractFunctionDecl *
ClassDecl::findImplementingMethod(const AbstractFunctionDecl *Method) const {
const ClassDecl *C = this;
while (C) {
auto Members = C->getMembers();
for (auto M : Members) {
FuncDecl *CurMethod = dyn_cast<FuncDecl>(M);
AbstractFunctionDecl *CurMethod = dyn_cast<AbstractFunctionDecl>(M);
if (!CurMethod)
continue;
if (Method == CurMethod)
@@ -3989,16 +4002,6 @@ bool FuncDecl::isBinaryOperator() const {
argTuple->getElement(0).hasEllipsis());
}
bool FuncDecl::isOverridingDecl(const FuncDecl *Method) const {
const FuncDecl *CurMethod = this;
while (CurMethod) {
if (CurMethod == Method)
return true;
CurMethod = CurMethod->getOverriddenDecl();
}
return false;
}
ConstructorDecl::ConstructorDecl(DeclName Name, SourceLoc ConstructorLoc,
OptionalTypeKind Failability,
SourceLoc FailabilityLoc,