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-api-digester: teach the tool to serialize/deserialize super class Usrs. rdar://32778228

Browse Source 
This can help us eliminate false positives when we report removed
declarations are actually moved to a newly-introduced super class.
This commit is contained in:
Xi Ge
2017-06-21 13:15:29 -07:00
parent e51bc3beca
commit 87a0cfb910
4 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tools/swift-api-digester/swift-api-digester.cpp
View File

@@ -299,6 +299,7 @@ struct SDKNodeInitInfo {
Ownership Ownership = Ownership::Strong;
std::vector<SDKDeclAttrKind> DeclAttrs;
std::vector<TypeAttrKind> TypeAttrs;
StringRef SuperclassUsr;
SDKNodeInitInfo(SDKContext &Ctx) : Ctx(Ctx) {}
SDKNodeInitInfo(SDKContext &Ctx, ValueDecl *VD);
SDKNodeInitInfo(SDKContext &Ctx, Type Ty);
@@ -683,10 +684,12 @@ SDKNodeDecl *SDKNodeType::getClosestParentDecl() const {
}
class SDKNodeTypeDecl : public SDKNodeDecl {
StringRef SuperclassUsr;
public:
SDKNodeTypeDecl(SDKNodeInitInfo Info) : SDKNodeDecl(Info,
SDKNodeKind::TypeDecl) {}
SDKNodeTypeDecl(SDKNodeInitInfo Info) : SDKNodeDecl(Info, SDKNodeKind::TypeDecl),
SuperclassUsr(Info.SuperclassUsr) {}
static bool classof(const SDKNode *N);
StringRef getSuperClassUsr() const { return SuperclassUsr; }
};
class SDKNodeTypeAlias : public SDKNodeDecl {
@@ -828,6 +831,9 @@ SDKNode* SDKNode::constructSDKNode(SDKContext &Ctx,
case KeyKind::KK_moduleName:
Info.ModuleName = GetScalarString(Pair.getValue());
break;
case KeyKind::KK_superclassUsr:
Info.SuperclassUsr = GetScalarString(Pair.getValue());
break;
case KeyKind::KK_throwing:
Info.IsThrowing = true;
break;
@@ -1092,6 +1098,12 @@ SDKNodeInitInfo::SDKNodeInitInfo(SDKContext &Ctx, ValueDecl *VD) : Ctx(Ctx),
IsThrowing(isFuncThrowing(VD)), IsMutating(isFuncMutating(VD)),
IsStatic(VD->isStatic()), SelfIndex(getSelfIndex(VD)),
Ownership(getOwnership(VD)) {
// Calculate usr for its super class.
if (auto *CD = dyn_cast_or_null<ClassDecl>(VD)) {
if (auto *Super = CD->getSuperclassDecl())
SuperclassUsr = calculateUsr(Ctx, Super);
}
if (VD->getAttrs().getDeprecated(VD->getASTContext()))
DeclAttrs.push_back(SDKDeclAttrKind::DAK_deprecated);
}
@@ -1441,6 +1453,13 @@ namespace swift {
Index);
}
}
if (auto *TD = dyn_cast<SDKNodeTypeDecl>(value)) {
auto Super = TD->getSuperClassUsr();
if (!Super.empty()) {
out.mapRequired(getKeyContent(Ctx, KeyKind::KK_superclassUsr).data(),
Super);
}
}
auto Attributes = D->getDeclAttributes();
if (!Attributes.empty())
out.mapRequired(getKeyContent(Ctx, KeyKind::KK_declAttributes).data(),