Merge pull request #5473 from nkcsgexi/digester-cleanup

Author: swift-ci

test/api-digester/Inputs/cake1.swift

@@ -7,4 +7,5 @@ public struct S1 {
 
 public class C1 {
   public class func foo1() {}
+  public func foo2(_ : Int) {}
 }

test/api-digester/Inputs/cake2.swift

@@ -7,4 +7,5 @@ public struct S1 {
 
 public class C1 {
   public func foo1() {}
+  public func foo2(_ : ()->()) {}
 }

test/api-digester/Outputs/Cake.txt

@@ -7,6 +7,7 @@
 
 ==================================================== Type Changes ====================================================
 Constructor S1.init(_:) has 1st parameter type change from Int to Double
+Func C1.foo2(_:) has 1st parameter type change from Int to () -> ()
 
 ==================================================== Decl Attribute changes ====================================================
 Func C1.foo1() is now not static

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

@@ -2001,16 +2001,22 @@ class PrunePass : public MatchedNodeListener, public SDKTreeDiffPass {
   }
 
   virtual void foundMatch(NodePtr Left, NodePtr Right) override {
+    Left->annotate(NodeAnnotation::Updated);
+    Right->annotate(NodeAnnotation::Updated);
+    // Push the updated node to the map for future reference.
+    UpdateMap->foundMatch(Left, Right);
+
+    if (Left->getKind() != Right->getKind()) {
+      assert(isa<SDKNodeType>(Left) && isa<SDKNodeType>(Right) &&
+        "only type nodes can match across kinds.");
+      return;
+    }
     assert(Left->getKind() == Right->getKind());
     SDKNodeKind Kind = Left->getKind();
     assert(Left->getKind() != SDKNodeKind::Nil &&
            Right->getKind() != SDKNodeKind::Nil);
     assert(Kind == SDKNodeKind::Root || *Left != *Right);
 
-    Left->annotate(NodeAnnotation::Updated);
-    Right->annotate(NodeAnnotation::Updated);
-    // Push the updated node to the map for future reference.
-    UpdateMap->foundMatch(Left, Right);
     detectRename(Left, Right);
     detectThrowing(Left, Right);
     detectMutating(Left, Right);