Merge pull request #19669 from nkcsgexi/address-slava-commets

swift-module-digester: Address Slava's comments

Author: nkcsgexi

include/swift/AST/DiagnosticsModuleDiffer.def

@@ -58,7 +58,7 @@ ERROR(decl_reorder,none,"%0 in a non-resilient type changes position from %1 to
 
 ERROR(decl_added,none,"%0 is added to a non-resilient type", (StringRef))
 
-ERROR(decl_has_fixed_order_change,none,"%0 is %select{now|no longer}1 a property with fixed layout order", (StringRef, bool))
+ERROR(decl_has_fixed_order_change,none,"%0 is %select{now|no longer}1 a stored property", (StringRef, bool))
 
 ERROR(default_arg_removed,none,"%0 has removed default argument from %1", (StringRef, StringRef))
 

test/api-digester/Outputs/Cake-abi.txt

@@ -54,8 +54,8 @@ cake1: EnumElement FrozenKind.Fixed in a non-resilient type changes position fro
 cake1: EnumElement FrozenKind.Rigid in a non-resilient type changes position from 2 to 1
 cake1: Var fixedLayoutStruct.a in a non-resilient type changes position from 1 to 0
 cake1: Var fixedLayoutStruct.b in a non-resilient type changes position from 0 to 1
-cake1: Var fixedLayoutStruct2.BecomeFixedBinaryOrder is now a property with fixed layout order
-cake1: Var fixedLayoutStruct2.NoLongerWithFixedBinaryOrder is no longer a property with fixed layout order
+cake1: Var fixedLayoutStruct2.BecomeFixedBinaryOrder is now a stored property
+cake1: Var fixedLayoutStruct2.NoLongerWithFixedBinaryOrder is no longer a stored property
 cake2: EnumElement FrozenKind.AddedCase is added to a non-resilient type
 cake2: Var fixedLayoutStruct.c is added to a non-resilient type
 cake2: Var fixedLayoutStruct.lazy_d.storage is added to a non-resilient type
@@ -69,7 +69,6 @@ cake1: Struct fixedLayoutStruct has removed conformance to P1
 
 /* Protocol Requirement Change */
 cake1: AssociatedType AssociatedTypePro.T1 has removed default type Int
-cake2: AssociatedType RequiementChanges.addedTypeWithDefault has been added as a protocol requirement
 cake2: AssociatedType RequiementChanges.addedTypeWithoutDefault has been added as a protocol requirement
 cake2: Func RequiementChanges.addedFunc() has been added as a protocol requirement
 cake2: Var RequiementChanges.addedVar has been added as a protocol requirement

test/api-digester/Outputs/Cake.txt

@@ -47,7 +47,6 @@ cake1: Struct fixedLayoutStruct has removed conformance to P1
 
 /* Protocol Requirement Change */
 cake1: AssociatedType AssociatedTypePro.T1 has removed default type Int
-cake2: AssociatedType RequiementChanges.addedTypeWithDefault has been added as a protocol requirement
 cake2: AssociatedType RequiementChanges.addedTypeWithoutDefault has been added as a protocol requirement
 cake2: Func RequiementChanges.addedFunc() has been added as a protocol requirement
 cake2: Var RequiementChanges.addedVar has been added as a protocol requirement

tools/swift-api-digester/swift-api-digester.cpp

@@ -942,7 +942,14 @@ class PrunePass : public MatchedNodeListener, public SDKTreeDiffPass {
       }
       // Complain about added protocol requirements
       if (auto *D = dyn_cast<SDKNodeDecl>(Right)) {
-        if (D->isProtocolRequirement() && !D->isOverriding()) {
+        if (D->isProtocolRequirement()) {
+          bool ShouldComplain = !D->isOverriding();
+          // We should allow added associated types with default.
+          if (auto ATD = dyn_cast<SDKNodeDeclAssociatedType>(D)) {
+            if (ATD->getDefault())
+              ShouldComplain = false;
+          }
+          if (ShouldComplain)
             Ctx.getDiags().diagnose(SourceLoc(), diag::protocol_req_added,
                                     D->getScreenInfo());
         }