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

swift-module-digester: include non-resilient class decls when checking ABI stability.

Browse Source
This commit is contained in:
Xi Ge
2018-10-05 14:48:00 -07:00
parent 30d15682d5
commit 8a769a0460
4 changed files with 67 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tools/swift-api-digester/ModuleAnalyzerNodes.cpp
View File

@@ -989,11 +989,12 @@ static StringRef printGenericSignature(SDKContext &Ctx, Decl *D) {
}
static Optional<uint8_t> getFixedBinaryOrder(ValueDecl *VD) {
auto D = VD->getDeclContext()->getAsDecl();
if (!D)
auto *NTD = dyn_cast_or_null<NominalTypeDecl>(VD->getDeclContext()->getAsDecl());
if (!NTD || isa<ProtocolDecl>(NTD))
return None;
if (auto *ED = dyn_cast<EnumDecl>(D)) {
if (auto *ED = dyn_cast<EnumDecl>(NTD)) {
auto Check = [](Decl *M) {
return isa<EnumElementDecl>(M);
};
@@ -1003,20 +1004,19 @@ static Optional<uint8_t> getFixedBinaryOrder(ValueDecl *VD) {
assert(End != Members.end());
return std::count_if(Members.begin(), End, Check);
}
return None;
}
if (auto *SD = dyn_cast<StructDecl>(D)) {
auto Check = [](Decl *M) {
if (auto *STD = dyn_cast<AbstractStorageDecl>(M)) {
return STD->hasStorage() && !STD->isStatic();
}
return false;
};
if (!SD->isResilient() && Check(VD)) {
auto Members = SD->getMembers();
auto End = std::find(Members.begin(), Members.end(), VD);
assert(End != Members.end());
return std::count_if(Members.begin(), End, Check);
auto Check = [](Decl *M) {
if (auto *STD = dyn_cast<AbstractStorageDecl>(M)) {
return STD->hasStorage() && !STD->isStatic();
}
return false;
};
if (!NTD->isResilient() && Check(VD)) {
auto Members = NTD->getMembers();
auto End = std::find(Members.begin(), Members.end(), VD);
assert(End != Members.end());
return std::count_if(Members.begin(), End, Check);
}
return llvm::None;
}