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

swift-module-digester: under ABI checking mode, include private decls with fixed binary order.

Browse Source
This commit is contained in:
Xi Ge
2018-09-19 12:07:08 -07:00
parent 555ee21781
commit 971755d5a3
4 changed files with 175 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1117,7 +1117,7 @@ static SDKNode* constructInitNode(SDKContext &Ctx, ConstructorDecl *CD) {
return Func;
}
static bool shouldIgnore(Decl *D, const Decl* Parent) {
static bool shouldIgnore(Decl *D, const Decl* Parent, SDKContext &Ctx) {
if (D->isPrivateStdlibDecl(false))
return true;
if (AvailableAttr::isUnavailable(D))
@@ -1135,6 +1135,10 @@ static bool shouldIgnore(Decl *D, const Decl* Parent) {
case AccessLevel::Internal:
case AccessLevel::Private:
case AccessLevel::FilePrivate:
// Private vars with fixed binary orders can have ABI-impact, so we should
// whitelist them if we're checking ABI.
if (Ctx.checkingABI() && getFixedBinaryOrder(VD).hasValue())
break;
return true;
case AccessLevel::Public:
case AccessLevel::Open:
@@ -1216,7 +1220,7 @@ static void addMembersToRoot(SDKContext &Ctx, SDKNode *Root,
IterableDeclContext *Context,
std::set<ExtensionDecl*> &HandledExts) {
for (auto *Member : Context->getMembers()) {
if (shouldIgnore(Member, Context->getDecl()))
if (shouldIgnore(Member, Context->getDecl(), Ctx))
continue;
if (auto Func = dyn_cast<FuncDecl>(Member)) {
Root->addChild(constructFunctionNode(Ctx, Func, SDKNodeKind::DeclFunction));
@@ -1245,7 +1249,7 @@ void SwiftDeclCollector::lookupVisibleDecls(ArrayRef<ModuleDecl *> Modules) {
llvm::SmallVector<Decl*, 512> Decls;
M->getDisplayDecls(Decls);
for (auto D : Decls) {
if (shouldIgnore(D, nullptr))
if (shouldIgnore(D, nullptr, Ctx))
continue;
if (KnownDecls.count(D))
continue;