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: diagnose non-final function changes in non-resilient classes.

Browse Source
This commit is contained in:
Xi Ge
2018-10-08 12:15:50 -07:00
parent 9ed3894667
commit bfadd46d57
11 changed files with 106 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -733,6 +733,12 @@ void swift::ide::api::SDKNodeDeclFunction::diagnose(SDKNode *Right) {
Diags.diagnose(SourceLoc(), diag::func_self_access_change, getScreenInfo(),
getSelfAccessKind(), R->getSelfAccessKind());
}
if (Ctx.checkingABI()) {
if (hasFixedBinaryOrder() != R->hasFixedBinaryOrder()) {
Ctx.getDiags().diagnose(SourceLoc(), diag::func_has_fixed_order_change,
getScreenInfo(), hasFixedBinaryOrder());
}
}
}
void swift::ide::api::SDKNodeDeclSubscript::diagnose(SDKNode *Right) {
@@ -803,6 +809,13 @@ void swift::ide::api::SDKNodeDecl::diagnose(SDKNode *Right) {
Desc);
}
}
if (hasFixedBinaryOrder() && RD->hasFixedBinaryOrder() &&
getFixedBinaryOrder() != RD->getFixedBinaryOrder()) {
Ctx.getDiags().diagnose(SourceLoc(), diag::decl_reorder,
getScreenInfo(),
getFixedBinaryOrder(),
RD->getFixedBinaryOrder());
}
}
}
@@ -828,16 +841,9 @@ void swift::ide::api::SDKNodeDeclVar::diagnose(SDKNode *Right) {
}
if (Ctx.checkingABI()) {
if (hasFixedBinaryOrder() != RV->hasFixedBinaryOrder()) {
Ctx.getDiags().diagnose(SourceLoc(), diag::decl_has_fixed_order_change,
Ctx.getDiags().diagnose(SourceLoc(), diag::var_has_fixed_order_change,
getScreenInfo(), hasFixedBinaryOrder());
}
if (hasFixedBinaryOrder() && RV->hasFixedBinaryOrder() &&
getFixedBinaryOrder() != RV->getFixedBinaryOrder()) {
Ctx.getDiags().diagnose(SourceLoc(), diag::decl_reorder,
getScreenInfo(),
getFixedBinaryOrder(),
RV->getFixedBinaryOrder());
}
if (isLet() != RV->isLet()) {
Ctx.getDiags().diagnose(SourceLoc(), diag::var_let_changed,
getScreenInfo(),
@@ -959,10 +965,11 @@ public:
assert(!Left);
Right->annotate(NodeAnnotation::Added);
if (Ctx.checkingABI()) {
if (auto *VAD = dyn_cast<SDKNodeDeclVar>(Right)) {
if (VAD->hasFixedBinaryOrder()) {
// Any order-important decl added to a non-resilient type breaks ABI.
if (auto *D = dyn_cast<SDKNodeDecl>(Right)) {
if (D->hasFixedBinaryOrder()) {
Ctx.getDiags().diagnose(SourceLoc(), diag::decl_added,
VAD->getScreenInfo());
D->getScreenInfo());
}
}
}