swift-module-digester: keep track of super class names in the module dump

Author: nkcsgexi

include/swift/IDE/DigesterEnums.def

@@ -109,6 +109,7 @@ KEY(declAttributes)
 KEY(declKind)
 KEY(ownership)
 KEY(superclassUsr)
+KEY(superclassName)
 KEY(hasDefaultArg)
 KEY(conformingProtocols)
 KEY(enumRawTypeName)

test/api-digester/Outputs/cake-abi.json

@@ -198,6 +198,7 @@
       "location": "",
       "moduleName": "cake",
       "superclassUsr": "s:4cake2C0C",
+      "superclassName": "C0",
       "children": [
         {
           "kind": "Function",

test/api-digester/Outputs/cake.json

@@ -205,6 +205,7 @@
       "location": "",
       "moduleName": "cake",
       "superclassUsr": "s:4cake2C0C",
+      "superclassName": "C0",
       "children": [
         {
           "kind": "Function",

test/api-digester/Outputs/clang-module-dump.txt

@@ -12,6 +12,7 @@
       "location": "",
       "moduleName": "Foo",
       "superclassUsr": "c:objc(cs)NSObject",
+      "superclassName": "NSObject",
       "conformingProtocols": [
         "ObjcProt",
         "NSObjectProtocol"

tools/swift-api-digester/ModuleAnalyzerNodes.cpp

@@ -48,6 +48,7 @@ struct swift::ide::api::SDKNodeInitInfo {
   std::vector<TypeAttrKind> TypeAttrs;
   std::vector<StringRef> ConformingProtocols;
   StringRef SuperclassUsr;
+  StringRef SuperclassName;
   StringRef EnumRawTypeName;
   bool hasDefaultArgument = false;
   StringRef GenericSig;
@@ -100,6 +101,7 @@ SDKNodeTypeAlias::SDKNodeTypeAlias(SDKNodeInitInfo Info):
 
 SDKNodeDeclType::SDKNodeDeclType(SDKNodeInitInfo Info): 
   SDKNodeDecl(Info, SDKNodeKind::DeclType), SuperclassUsr(Info.SuperclassUsr),
+  SuperclassName(Info.SuperclassName),
   ConformingProtocols(Info.ConformingProtocols),
   EnumRawTypeName(Info.EnumRawTypeName) {}
 
@@ -568,6 +570,9 @@ SDKNode* SDKNode::constructSDKNode(SDKContext &Ctx,
       case KeyKind::KK_superclassUsr:
         Info.SuperclassUsr = GetScalarString(Pair.getValue());
         break;
+      case KeyKind::KK_superclassName:
+        Info.SuperclassName = GetScalarString(Pair.getValue());
+        break;
       case KeyKind::KK_genericSig:
         Info.GenericSig = GetScalarString(Pair.getValue());
         break;
@@ -756,6 +761,9 @@ bool SDKNode::operator==(const SDKNode &Other) const {
         if (!hasSameContents(Left->getAllProtocols(), Right->getAllProtocols())) {
           return false;
         }
+        if (Left->getSuperClassName() != Right->getSuperClassName()) {
+          return false;
+        }
       }
       LLVM_FALLTHROUGH;
     }
@@ -1059,8 +1067,10 @@ SDKNodeInitInfo::SDKNodeInitInfo(SDKContext &Ctx, ValueDecl *VD)
 
   // Calculate usr for its super class.
   if (auto *CD = dyn_cast_or_null<ClassDecl>(VD)) {
-    if (auto *Super = CD->getSuperclassDecl())
+    if (auto *Super = CD->getSuperclassDecl()) {
       SuperclassUsr = calculateUsr(Ctx, Super);
+      SuperclassName = Super->getName().str();
+    }
   }
 
   // Capture all attributes.
@@ -1508,6 +1518,11 @@ struct ObjectTraits<SDKNode *> {
           out.mapRequired(getKeyContent(Ctx, KeyKind::KK_superclassUsr).data(),
                           Super);
         }
+        auto SuperName = TD->getSuperClassName();
+        if (!SuperName.empty()) {
+          out.mapRequired(getKeyContent(Ctx, KeyKind::KK_superclassName).data(),
+                          SuperName);
+        }
         auto Pros = TD->getAllProtocols();
         if (!Pros.empty()) {
           out.mapRequired(getKeyContent(Ctx,

tools/swift-api-digester/ModuleAnalyzerNodes.h

@@ -407,12 +407,14 @@ class SDKNodeVectorViewer::ViewerIterator :
 
 class SDKNodeDeclType : public SDKNodeDecl {
   StringRef SuperclassUsr;
+  StringRef SuperclassName;
   std::vector<StringRef> ConformingProtocols;
   StringRef EnumRawTypeName;
 public:
   SDKNodeDeclType(SDKNodeInitInfo Info);
   static bool classof(const SDKNode *N);
   StringRef getSuperClassUsr() const { return SuperclassUsr; }
+  StringRef getSuperClassName() const { return SuperclassName; }
   ArrayRef<StringRef> getAllProtocols() const { return ConformingProtocols; }
 
 #define NOMINAL_TYPE_DECL(ID, PARENT) \