AST: Inline ConformanceLookupTable::addInheritedProtocols()

Author: slavapestov

lib/AST/ConformanceLookupTable.cpp

@@ -295,8 +295,19 @@ void ConformanceLookupTable::updateLookupTable(NominalTypeDecl *nominal,
     forEachInStage(
         stage, nominal,
         [&](NominalTypeDecl *nominal) {
-          addInheritedProtocols(nominal,
-                                ConformanceSource::forExplicit(nominal));
+          auto source = ConformanceSource::forExplicit(nominal);
+
+          // Get all of the protocols in the inheritance clause.
+          InvertibleProtocolSet inverses;
+          bool anyObject = false;
+          for (const auto &found :
+                  getDirectlyInheritedNominalTypeDecls(nominal, inverses, anyObject)) {
+            if (auto proto = dyn_cast<ProtocolDecl>(found.Item)) {
+              addProtocol(proto, found.Loc,
+                          source.withUncheckedLoc(found.uncheckedLoc)
+                                .withPreconcurrencyLoc(found.preconcurrencyLoc));
+            }
+          }
 
           addMacroGeneratedProtocols(
               nominal, ConformanceSource::forUnexpandedMacro(nominal));
@@ -494,22 +505,6 @@ bool ConformanceLookupTable::addProtocol(ProtocolDecl *protocol, SourceLoc loc,
   return true;
 }
 
-void ConformanceLookupTable::addInheritedProtocols(
-    llvm::PointerUnion<const TypeDecl *, const ExtensionDecl *> decl,
-    ConformanceSource source) {
-  // Find all of the protocols in the inheritance list.
-  InvertibleProtocolSet inverses;
-  bool anyObject = false;
-  for (const auto &found :
-          getDirectlyInheritedNominalTypeDecls(decl, inverses, anyObject)) {
-    if (auto proto = dyn_cast<ProtocolDecl>(found.Item)) {
-      addProtocol(proto, found.Loc,
-                  source.withUncheckedLoc(found.uncheckedLoc)
-                        .withPreconcurrencyLoc(found.preconcurrencyLoc));
-    }
-  }
-}
-
 void ConformanceLookupTable::addMacroGeneratedProtocols(
     NominalTypeDecl *nominal, ConformanceSource source) {
   nominal->forEachAttachedMacro(

lib/AST/ConformanceLookupTable.h

@@ -381,11 +381,6 @@ class ConformanceLookupTable : public ASTAllocated<ConformanceLookupTable> {
   bool addProtocol(ProtocolDecl *protocol, SourceLoc loc,
                    ConformanceSource source);
 
-  /// Add the protocols from the given list.
-  void addInheritedProtocols(
-      llvm::PointerUnion<const TypeDecl *, const ExtensionDecl *> decl,
-      ConformanceSource source);
-
   /// Add the protocols added by attached extension macros that are not
   /// yet expanded.
   void addMacroGeneratedProtocols(