Reflection: Move some code from TypeRefBuilder.h to TypeRefBuilder.cpp, NFC

Now that we no longer need the template parameter everywhere
we can start moving code out of header files.

Author: slavapestov

include/swift/Reflection/TypeRefBuilder.h

@@ -215,181 +215,26 @@ class TypeRefBuilder {
 
   const AssociatedTypeDescriptor *
   lookupAssociatedTypes(const std::string &MangledTypeName,
-                        const DependentMemberTypeRef *DependentMember) {
-    // Cache missed - we need to look through all of the assocty sections
-    // for all images that we've been notified about.
-    for (auto &Info : ReflectionInfos) {
-      for (const auto &AssocTyDescriptor : Info.assocty) {
-        std::string ConformingTypeName(AssocTyDescriptor.ConformingTypeName);
-        if (ConformingTypeName.compare(MangledTypeName) != 0)
-          continue;
-        std::string ProtocolMangledName(AssocTyDescriptor.ProtocolTypeName);
-        auto DemangledProto = Demangle::demangleTypeAsNode(ProtocolMangledName);
-        auto TR = swift::remote::decodeMangledType(*this, DemangledProto);
-
-        auto &Conformance = *DependentMember->getProtocol();
-        if (auto Protocol = dyn_cast<ProtocolTypeRef>(TR)) {
-          if (*Protocol != Conformance)
-            continue;
-          return &AssocTyDescriptor;
-        }
-      }
-    }
-    return nullptr;
-  }
+                        const DependentMemberTypeRef *DependentMember);
 
- public:
+public:
   const TypeRef *
   getDependentMemberTypeRef(const std::string &MangledTypeName,
-                            const DependentMemberTypeRef *DependentMember) {
-
-    if (auto AssocTys = lookupAssociatedTypes(MangledTypeName, DependentMember)) {
-      for (auto &AssocTy : *AssocTys) {
-        if (DependentMember->getMember().compare(AssocTy.getName()) != 0)
-          continue;
-
-        auto SubstitutedTypeName = AssocTy.getMangledSubstitutedTypeName();
-        auto Demangled = Demangle::demangleTypeAsNode(SubstitutedTypeName);
-        return swift::remote::decodeMangledType(*this, Demangled);
-      }
-    }
-    return nullptr;
-  }
+                            const DependentMemberTypeRef *DependentMember);
 
   std::vector<std::pair<std::string, const TypeRef *>>
-  getFieldTypeRefs(const TypeRef *TR) {
-    std::string MangledName;
-    if (auto N = dyn_cast<NominalTypeRef>(TR))
-      MangledName = N->getMangledName();
-    else if (auto BG = dyn_cast<BoundGenericTypeRef>(TR))
-      MangledName = BG->getMangledName();
-    else
-      return {};
-
-    auto Subs = TR->getSubstMap();
-
-    std::vector<std::pair<std::string, const TypeRef *>> Fields;
-    for (auto Info : ReflectionInfos) {
-      for (auto &FieldDescriptor : Info.fieldmd) {
-        auto CandidateMangledName = FieldDescriptor.MangledTypeName.get();
-        if (!CandidateMangledName)
-          continue;
-        if (MangledName.compare(CandidateMangledName) != 0)
-          continue;
-        for (auto &Field : FieldDescriptor) {
-          auto FieldName = Field.getFieldName();
-
-          // Empty cases of enums do not have a type
-          if (!Field.hasMangledTypeName()) {
-            Fields.push_back({FieldName, nullptr});
-            continue;
-          }
-
-          auto Demangled
-            = Demangle::demangleTypeAsNode(Field.getMangledTypeName());
-          auto Unsubstituted = swift::remote::decodeMangledType(*this, Demangled);
-          if (!Unsubstituted)
-            return {};
-
-          auto Substituted = Unsubstituted->subst(*this, Subs);
-          if (FieldName.empty())
-            FieldName = "<Redacted Field Name>";
-          Fields.push_back({FieldName, Substituted});
-        }
-      }
-    }
-    return Fields;
-  }
+  getFieldTypeRefs(const TypeRef *TR);
 
   ///
   /// Dumping typerefs, field declarations, associated types
   ///
 
   void dumpTypeRef(const std::string &MangledName,
-                   std::ostream &OS, bool printTypeName = false) {
-    auto TypeName = Demangle::demangleTypeAsString(MangledName);
-    OS << TypeName << '\n';
-
-    auto DemangleTree = Demangle::demangleTypeAsNode(MangledName);
-    auto TR = swift::remote::decodeMangledType(*this, DemangleTree);
-    if (!TR) {
-      OS << "!!! Invalid typeref: " << MangledName << '\n';
-      return;
-    }
-    TR->dump(OS);
-    OS << '\n';
-  }
-
-  void dumpFieldSection(std::ostream &OS) {
-    for (const auto &sections : ReflectionInfos) {
-      for (const auto &descriptor : sections.fieldmd) {
-        auto TypeName
-          = Demangle::demangleTypeAsString(descriptor.getMangledTypeName());
-        OS << TypeName << '\n';
-        for (size_t i = 0; i < TypeName.size(); ++i)
-          OS << '-';
-        OS << '\n';
-        for (auto &field : descriptor) {
-          OS << field.getFieldName();
-          if (field.hasMangledTypeName()) {
-            OS << ": ";
-            dumpTypeRef(field.getMangledTypeName(), OS);
-          } else {
-            OS << "\n\n";
-          }
-        }
-      }
-    }
-  }
-
-  void dumpAssociatedTypeSection(std::ostream &OS) {
-    for (const auto &sections : ReflectionInfos) {
-      for (const auto &descriptor : sections.assocty) {
-        auto conformingTypeName = Demangle::demangleTypeAsString(
-          descriptor.getMangledConformingTypeName());
-        auto protocolName = Demangle::demangleTypeAsString(
-          descriptor.getMangledProtocolTypeName());
-
-        OS << "- " << conformingTypeName << " : " << protocolName;
-        OS << '\n';
-
-        for (const auto &associatedType : descriptor) {
-          OS << "typealias " << associatedType.getName() << " = ";
-          dumpTypeRef(associatedType.getMangledSubstitutedTypeName(), OS);
-        }
-      }
-    }
-  }
-
-  void dumpBuiltinTypeSection(std::ostream &OS) {
-    for (const auto &sections : ReflectionInfos) {
-      for (const auto &descriptor : sections.builtin) {
-        auto typeName = Demangle::demangleTypeAsString(
-          descriptor.getMangledTypeName());
-
-        OS << "\n- " << typeName << ":\n";
-        OS << "Size: " << descriptor.Size << "\n";
-        OS << "Alignment: " << descriptor.Alignment << "\n";
-        OS << "Stride: " << descriptor.Stride << "\n";
-        OS << "NumExtraInhabitants: " << descriptor.NumExtraInhabitants << "\n";
-      }
-    }
-  }
-
-  void dumpAllSections(std::ostream &OS) {
-    OS << "FIELDS:\n";
-    OS << "=======\n";
-    dumpFieldSection(OS);
-    OS << '\n';
-    OS << "ASSOCIATED TYPES:\n";
-    OS << "=================\n";
-    dumpAssociatedTypeSection(OS);
-    OS << '\n';
-    OS << "BUILTIN TYPES:\n";
-    OS << "==============\n";
-    dumpBuiltinTypeSection(OS);
-    OS << '\n';
-  }
+                   std::ostream &OS, bool printTypeName = false);
+  void dumpFieldSection(std::ostream &OS);
+  void dumpAssociatedTypeSection(std::ostream &OS);
+  void dumpBuiltinTypeSection(std::ostream &OS);
+  void dumpAllSections(std::ostream &OS);
 };
 
 

stdlib/public/Reflection/CMakeLists.txt

@@ -3,4 +3,5 @@ add_swift_library(swiftReflection IS_STDLIB IS_HOST
   MetadataSource.cpp
   Remangle.cpp
   TypeRef.cpp
+  TypeRefBuilder.cpp
   INSTALL_IN_COMPONENT dev)