From 819e53e94f733ce716d91a3f1fc11d1b36b075af Mon Sep 17 00:00:00 2001 From: Xi Ge Date: Wed, 20 Oct 2021 13:16:52 -0700 Subject: [PATCH] ABI checker: removing deprecated APIs should be considered acceptable --- lib/DriverTool/swift_api_digester_main.cpp | 5 ++++- test/api-digester/stability-concurrency-abi.test | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/DriverTool/swift_api_digester_main.cpp b/lib/DriverTool/swift_api_digester_main.cpp index 654800c0e2443..124105a9bde7b 100644 --- a/lib/DriverTool/swift_api_digester_main.cpp +++ b/lib/DriverTool/swift_api_digester_main.cpp @@ -553,7 +553,10 @@ static void diagnoseRemovedDecl(const SDKNodeDecl *D) { if (D->hasDeclAttribute(DeclAttrKind::DAK_AlwaysEmitIntoClient)) return; } - D->emitDiag(SourceLoc(), diag::removed_decl, D->isDeprecated()); + // Don't diagnose removal of deprecated APIs. + if (!D->isDeprecated()) { + D->emitDiag(SourceLoc(), diag::removed_decl, false); + } } // This is first pass on two given SDKNode trees. This pass removes the common part diff --git a/test/api-digester/stability-concurrency-abi.test b/test/api-digester/stability-concurrency-abi.test index e3eb43bc95fe2..fd1001f76c1f5 100644 --- a/test/api-digester/stability-concurrency-abi.test +++ b/test/api-digester/stability-concurrency-abi.test @@ -116,7 +116,6 @@ Struct TaskGroup has generic signature change from to to Struct ThrowingTaskGroup has generic signature change from to Struct ThrowingTaskGroup.Iterator has generic signature change from to -Struct YieldingContinuation has been removed (deprecated) Subscript TaskLocal.subscript(_enclosingInstance:wrapped:storage:) has been removed 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' // *** DO NOT DISABLE OR XFAIL THIS TEST. *** (See comment above.)