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

Merge pull request #13866 from rjmccall/accessor-decl

Browse Source 
Split AccessorDecl out from FuncDecl.  NFC.
This commit is contained in:
John McCall
2018-01-12 17:02:35 -05:00
committed by GitHub
parent 9b58ed0ad7 7f0f8830cd
commit 52bb547a7e
85 changed files with 2025 additions and 1585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/SIL/SILDeclRef.cpp
View File

@@ -91,10 +91,10 @@ bool swift::requiresForeignEntryPoint(ValueDecl *vd) {
if (vd->hasClangNode())
return true;
if (auto *fd = dyn_cast<FuncDecl>(vd)) {
if (auto *accessor = dyn_cast<AccessorDecl>(vd)) {
// Property accessors should be generated alongside the property.
if (fd->isGetterOrSetter()) {
auto *asd = fd->getAccessorStorageDecl();
if (accessor->isGetterOrSetter()) {
auto *asd = accessor->getStorage();
if (asd->isObjC() && asd->hasClangNode())
return true;
}
@@ -187,7 +187,7 @@ bool SILDeclRef::isClangImported() const {
return !isForeign;
if (auto *FD = dyn_cast<FuncDecl>(d))
if (FD->isAccessor() ||
if (isa<AccessorDecl>(FD) ||
isa<NominalTypeDecl>(d->getDeclContext()))
return !isForeign;
}
@@ -356,9 +356,11 @@ FuncDecl *SILDeclRef::getFuncDecl() const {
}
bool SILDeclRef::isSetter() const {
if (!hasFuncDecl())
if (!hasDecl())
return false;
return getFuncDecl()->isSetter();
if (auto accessor = dyn_cast<AccessorDecl>(getDecl()))
return accessor->isSetter();
return false;
}
AbstractFunctionDecl *SILDeclRef::getAbstractFunctionDecl() const {
@@ -697,13 +699,13 @@ SILDeclRef SILDeclRef::getNextOverriddenVTableEntry() const {
return SILDeclRef();
}
if (auto *ovFD = dyn_cast<FuncDecl>(overridden.getDecl()))
if (auto *asd = ovFD->getAccessorStorageDecl()) {
if (asd->hasClangNode())
return SILDeclRef();
if (asd->isDynamic())
return SILDeclRef();
}
if (auto *accessor = dyn_cast<AccessorDecl>(overridden.getDecl())) {
auto *asd = accessor->getStorage();
if (asd->hasClangNode())
return SILDeclRef();
if (asd->isDynamic())
return SILDeclRef();
}
// If we overrode a decl from an extension, it won't be in a vtable
// either. This can occur for extensions to ObjC classes.