Skip to content

Commit 5e2a5cb

Browse files
authored
Merge pull request #39840 from nkcsgexi/skip-remove-deprec
ABI checker: removing deprecated APIs should be considered acceptable
2 parents a64564f + 819e53e commit 5e2a5cb

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

lib/DriverTool/swift_api_digester_main.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,10 @@ static void diagnoseRemovedDecl(const SDKNodeDecl *D) {
553553
if (D->hasDeclAttribute(DeclAttrKind::DAK_AlwaysEmitIntoClient))
554554
return;
555555
}
556-
D->emitDiag(SourceLoc(), diag::removed_decl, D->isDeprecated());
556+
// Don't diagnose removal of deprecated APIs.
557+
if (!D->isDeprecated()) {
558+
D->emitDiag(SourceLoc(), diag::removed_decl, false);
559+
}
557560
}
558561

559562
// This is first pass on two given SDKNode trees. This pass removes the common part

test/api-digester/stability-concurrency-abi.test

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ Struct TaskGroup has generic signature change from <ChildTaskResult> to <ChildTa
116116
Struct TaskGroup.Iterator has generic signature change from <ChildTaskResult> to <ChildTaskResult where ChildTaskResult : Swift.Sendable>
117117
Struct ThrowingTaskGroup has generic signature change from <ChildTaskResult, Failure where Failure : Swift.Error> to <ChildTaskResult, Failure where ChildTaskResult : Swift.Sendable, Failure : Swift.Error>
118118
Struct ThrowingTaskGroup.Iterator has generic signature change from <ChildTaskResult, Failure where Failure : Swift.Error> to <ChildTaskResult, Failure where ChildTaskResult : Swift.Sendable, Failure : Swift.Error>
119-
Struct YieldingContinuation has been removed (deprecated)
120119
Subscript TaskLocal.subscript(_enclosingInstance:wrapped:storage:) has been removed
121120
Var UnownedJob.context has mangled name changing from 'Swift.UnownedJob.(context in #UNSTABLE ID#) : Builtin.Job' to 'Swift.UnownedJob.(context in #UNSTABLE ID#) : Builtin.Job'
122121
// *** DO NOT DISABLE OR XFAIL THIS TEST. *** (See comment above.)

0 commit comments

Comments
 (0)