Swift-api-digester: check self-parameter explicitly instead of using its context. NFC (#8660)

Author: nkcsgexi

test/api-digester/Outputs/cake.json

@@ -148,11 +148,6 @@
                       "printedName": "C1"
                     }
                   ]
-                },
-                {
-                  "kind": "TypeNominal",
-                  "name": "C1",
-                  "printedName": "C1"
                 }
               ]
             },
@@ -170,11 +165,6 @@
                   "name": "Void",
                   "printedName": "()"
                 },
-                {
-                  "kind": "TypeNominal",
-                  "name": "C1",
-                  "printedName": "C1"
-                },
                 {
                   "kind": "TypeNominal",
                   "name": "Optional",
@@ -215,11 +205,6 @@
               "location": "",
               "moduleName": "cake",
               "children": [
-                {
-                  "kind": "TypeNominal",
-                  "name": "C1",
-                  "printedName": "C1"
-                },
                 {
                   "kind": "TypeNominal",
                   "name": "C1",
@@ -241,11 +226,6 @@
                   "name": "Void",
                   "printedName": "()"
                 },
-                {
-                  "kind": "TypeNominal",
-                  "name": "C1",
-                  "printedName": "C1"
-                },
                 {
                   "kind": "TypeNominal",
                   "name": "C1",

test/api-digester/source-stability.swift.expected

@@ -23,8 +23,10 @@ Func Dictionary.removeValue(forKey:) has been removed
 Func Dictionary.updateValue(_:forKey:) has been removed
 
 /* FIXME: Bogus */
+Var BidirectionalCollection.indices has declared type change from DefaultBidirectionalIndices<Self> to Self.Indices
 Var Dictionary.endIndex has declared type change from DictionaryIndex<Key, Value> to Dictionary<Key, Value>.Index
 Var Dictionary.startIndex has declared type change from DictionaryIndex<Key, Value> to Dictionary<Key, Value>.Index
+Var RandomAccessCollection.indices has declared type change from DefaultRandomAccessIndices<Self> to Self.Indices
 Var Set.endIndex has declared type change from SetIndex<Element> to Set<Element>.Index
 Var Set.startIndex has declared type change from SetIndex<Element> to Set<Element>.Index
 Constructor AnyIterator.init(_:) has parameter 0 type change from () -> Element? to () -> AnyIterator.Element?

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

@@ -1146,15 +1146,14 @@ static SDKNode *constructTypeNode(SDKContext &Ctx, Type T) {
 // We sometimes skip the first parameter because it can be metatype of dynamic
 // this if the function is a member function.
 static SDKNode *constructFunctionNode(SDKContext &Ctx, FuncDecl* FD,
-                                      SDKNodeKind Kind, bool SkipFirst) {
+                                      SDKNodeKind Kind) {
   auto Func = SDKNodeInitInfo(Ctx, FD).createSDKNode(Kind);
   Func->addChild(constructTypeNode(Ctx, FD->getResultInterfaceType()));
   for (auto *paramList : FD->getParameterLists()) {
-    for (auto param : *paramList)
-      Func->addChild(constructTypeNode(Ctx, param->getInterfaceType()));
-  }
-  if (SkipFirst) {
-    Func->removeChild(Func->getChildBegin() + 1);
+    for (auto param : *paramList) {
+      if (!param->isSelfParameter())
+        Func->addChild(constructTypeNode(Ctx, param->getInterfaceType()));
+    }
   }
   return Func;
 }
@@ -1225,9 +1224,9 @@ static SDKNode *constructVarNode(SDKContext &Ctx, ValueDecl *VD) {
   Var->addChild(constructTypeNode(Ctx, VD->getInterfaceType()));
   if (auto VAD = dyn_cast<AbstractStorageDecl>(VD)) {
     if (auto Getter = VAD->getGetter())
-      Var->addChild(constructFunctionNode(Ctx, Getter, SDKNodeKind::Getter, false));
+      Var->addChild(constructFunctionNode(Ctx, Getter, SDKNodeKind::Getter));
     if (auto Setter = VAD->getSetter())
-      Var->addChild(constructFunctionNode(Ctx, Setter, SDKNodeKind::Setter, false));
+      Var->addChild(constructFunctionNode(Ctx, Setter, SDKNodeKind::Setter));
   }
   return Var;
 }
@@ -1244,7 +1243,7 @@ static void addMembersToRoot(SDKContext &Ctx, SDKNode *Root,
     if (shouldIgnore(Member))
       continue;
     if (auto Func = dyn_cast<FuncDecl>(Member)) {
-      Root->addChild(constructFunctionNode(Ctx, Func, SDKNodeKind::Function, true));
+      Root->addChild(constructFunctionNode(Ctx, Func, SDKNodeKind::Function));
     } else if (auto CD = dyn_cast<ConstructorDecl>(Member)) {
       Root->addChild(constructInitNode(Ctx, CD));
     } else if (auto VD = dyn_cast<VarDecl>(Member)) {
@@ -1334,7 +1333,7 @@ class SwiftDeclCollector : public VisibleDeclConsumer {
       return;
 
     if (auto FD = dyn_cast<FuncDecl>(VD)) {
-      RootNode->addChild(constructFunctionNode(Ctx, FD, SDKNodeKind::Function, false));
+      RootNode->addChild(constructFunctionNode(Ctx, FD, SDKNodeKind::Function));
     } else if (auto NTD = dyn_cast<NominalTypeDecl>(VD)) {
       RootNode->addChild(constructTypeDeclNode(Ctx, NTD));
     }