Merge pull request #18775 from nkcsgexi/reorder-abi

Author: swift-ci

include/swift/IDE/DigesterEnums.def

@@ -62,6 +62,7 @@ NODE_ANNOTATION(OwnershipChange)
 NODE_ANNOTATION(ChangeObjC)
 NODE_ANNOTATION(ChangeFixedLayout)
 NODE_ANNOTATION(ChangeFrozen)
+NODE_ANNOTATION(ChangeDynamic)
 NODE_ANNOTATION(ChangeGenericSignature)
 NODE_ANNOTATION(RawTypeLeft)
 NODE_ANNOTATION(RawTypeRight)

test/api-digester/Inputs/cake1.swift

@@ -30,7 +30,10 @@ public class C4: OldType {
 }
 
 @objc
-public class C5 {}
+public class C5 {
+  @objc
+  public func dy_foo() {}
+}
 
 public struct C6 {}
 

test/api-digester/Inputs/cake2.swift

@@ -30,7 +30,10 @@ public struct NSSomestruct2 {
 
 public class C4: NewType {}
 
-public class C5 {}
+public class C5 {
+  @objc
+  public dynamic func dy_foo() {}
+}
 
 @_fixed_layout
 public struct C6 {}

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

@@ -26,5 +26,6 @@ cake1: Class C5 is now without @objc
 cake1: Var C1.CIIns1 changes from weak to strong
 cake1: Var C1.CIIns2 changes from strong to weak
 cake1: Func C1.foo1() is now not static
+cake1: Func C5.dy_foo() is now with dynamic
 cake1: Func S1.foo1() is now mutating
 cake1: Func S1.foo3() is now static

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

@@ -273,7 +273,9 @@ class SDKContext {
 
   static StringRef getAttrName(DeclAttrKind Kind) {
     switch (Kind) {
-#define DECL_ATTR(NAME, CLASS, ...) case DAK_##CLASS: return "@"#NAME;
+#define DECL_ATTR(NAME, CLASS, ...)                                           \
+    case DAK_##CLASS:                                                         \
+        return DeclAttribute::isDeclModifier(DAK_##CLASS) ? #NAME : "@"#NAME;
 #include "swift/AST/Attr.def"
     case DAK_Count:
       llvm_unreachable("unrecognized attribute kind.");
@@ -287,6 +289,7 @@ class SDKContext {
     ADD(ObjC)
     ADD(FixedLayout)
     ADD(Frozen)
+    ADD(Dynamic)
 #undef ADD
   }
   llvm::BumpPtrAllocator &allocator() {
@@ -3765,47 +3768,6 @@ class NoEscapingFuncEmitter : public SDKNodeVisitor {
     SDKNode::postorderVisit(Root, Emitter);
   }
 };
-
-class OverloadMemberFunctionEmitter : public SDKNodeVisitor {
-
-  std::vector<OverloadedFuncInfo> &AllItems;
-
-  void visit(NodePtr Node) override {
-    if (Node->getKind() != SDKNodeKind::DeclFunction)
-      return;
-    auto Parent = Node->getParent();
-    if (Parent->getKind() != SDKNodeKind::DeclType)
-      return;
-    DeclNameViewer CurrentViewer(Node->getPrintedName());
-    if (CurrentViewer.args().empty())
-      return;
-    for (auto &C : Parent->getChildren()) {
-      if (C == Node)
-        continue;
-      if (C->getKind() != SDKNodeKind::DeclFunction)
-        continue;
-      DeclNameViewer ChildViewer(C->getPrintedName());
-      if (ChildViewer.args().empty())
-        continue;
-      if (CurrentViewer.commonPartsCount(ChildViewer) >=
-          CurrentViewer.partsCount() - 1) {
-        AllItems.emplace_back(Node->getAs<SDKNodeDecl>()->getUsr());
-        return;
-      }
-    }
-  }
-
-  OverloadMemberFunctionEmitter(std::vector<OverloadedFuncInfo> &AllItems) :
-    AllItems(AllItems) {}
-
-public:
-  static void collectDiffItems(NodePtr Root,
-                               std::vector<OverloadedFuncInfo> &AllItems) {
-    OverloadMemberFunctionEmitter Emitter(AllItems);
-    SDKNode::postorderVisit(Root, Emitter);
-  }
-};
-
 } // end anonymous namespace
 
 namespace fs = llvm::sys::fs;