[NFC] AST: Relocate takeConformanceDiagnostics & getLocalProtocols to IterableDeclContext

Author: AnthonyLatsis

include/swift/AST/DeclContext.h

@@ -567,22 +567,6 @@ class alignas(1 << DeclContextAlignInBits) DeclContext {
   LLVM_READONLY
   ASTContext &getASTContext() const;
 
-  /// Retrieve the set of protocols whose conformances will be
-  /// associated with this declaration context.
-  ///
-  /// This function differs from \c getLocalConformances() in that it
-  /// returns protocol declarations, not protocol conformances, and
-  /// therefore does not require the protocol conformances to be
-  /// formed.
-  ///
-  /// \param lookupKind The kind of lookup to perform.
-  ///
-  /// FIXME: This likely makes more sense on IterableDeclContext or
-  /// something similar.
-  SmallVector<ProtocolDecl *, 2>
-  getLocalProtocols(ConformanceLookupKind lookupKind
-                      = ConformanceLookupKind::All) const;
-
   /// Retrieve the set of protocol conformances associated with this
   /// declaration context.
   ///
@@ -594,14 +578,6 @@ class alignas(1 << DeclContextAlignInBits) DeclContext {
   getLocalConformances(ConformanceLookupKind lookupKind
                          = ConformanceLookupKind::All) const;
 
-  /// Retrieve diagnostics discovered while expanding conformances for this
-  /// declaration context. This operation then removes those diagnostics from
-  /// consideration, so subsequent calls to this function with the same
-  /// declaration context that have not had any new extensions bound
-  /// will see an empty array.
-  SmallVector<ConformanceDiagnostic, 4>
-  takeConformanceDiagnostics() const;
-
   /// Retrieves a list of separately imported overlays which are shadowing
   /// \p declaring. If any \p overlays are returned, qualified lookups into
   /// \p declaring should be performed into \p overlays instead; since they
@@ -816,6 +792,26 @@ class IterableDeclContext {
   /// valid).
   bool wasDeserialized() const;
 
+  /// Retrieve the set of protocols whose conformances will be
+  /// associated with this declaration context.
+  ///
+  /// This function differs from \c getLocalConformances() in that it
+  /// returns protocol declarations, not protocol conformances, and
+  /// therefore does not require the protocol conformances to be
+  /// formed.
+  ///
+  /// \param lookupKind The kind of lookup to perform.
+  SmallVector<ProtocolDecl *, 2>
+  getLocalProtocols(ConformanceLookupKind lookupKind
+                      = ConformanceLookupKind::All) const;
+
+  /// Retrieve diagnostics discovered while expanding conformances for this
+  /// declaration context. This operation then removes those diagnostics from
+  /// consideration, so subsequent calls to this function with the same
+  /// declaration context that have not had any new extensions bound
+  /// will see an empty array.
+  SmallVector<ConformanceDiagnostic, 4> takeConformanceDiagnostics() const;
+
   /// Return 'this' as a \c Decl.
   const Decl *getDecl() const;
 

lib/AST/ProtocolConformance.cpp

@@ -1319,11 +1319,12 @@ NominalTypeDecl::getSatisfiedProtocolRequirementsForMember(
 }
 
 SmallVector<ProtocolDecl *, 2>
-DeclContext::getLocalProtocols(ConformanceLookupKind lookupKind) const {
+IterableDeclContext::getLocalProtocols(ConformanceLookupKind lookupKind) const {
   SmallVector<ProtocolDecl *, 2> result;
 
   // Dig out the nominal type.
-  NominalTypeDecl *nominal = getSelfNominalTypeDecl();
+  const auto dc = getAsGenericContext();
+  const auto nominal = dc->getSelfNominalTypeDecl();
   if (!nominal) {
     return result;
   }
@@ -1332,7 +1333,7 @@ DeclContext::getLocalProtocols(ConformanceLookupKind lookupKind) const {
   nominal->prepareConformanceTable();
   nominal->ConformanceTable->lookupConformances(
     nominal,
-    const_cast<DeclContext *>(this),
+    const_cast<GenericContext *>(dc),
     lookupKind,
     &result,
     nullptr,
@@ -1375,25 +1376,27 @@ DeclContext::getLocalConformances(ConformanceLookupKind lookupKind) const {
 }
 
 SmallVector<ConformanceDiagnostic, 4>
-DeclContext::takeConformanceDiagnostics() const {
+IterableDeclContext::takeConformanceDiagnostics() const {
   SmallVector<ConformanceDiagnostic, 4> result;
 
   // Dig out the nominal type.
-  NominalTypeDecl *nominal = getSelfNominalTypeDecl();
+  const auto dc = getAsGenericContext();
+  const auto nominal = dc->getSelfNominalTypeDecl();
+
   if (!nominal) {
-    return { };
+    return result;
   }
 
   // Protocols are not subject to the checks for supersession.
   if (isa<ProtocolDecl>(nominal)) {
-    return { };
+    return result;
   }
 
   // Update to record all potential conformances.
   nominal->prepareConformanceTable();
   nominal->ConformanceTable->lookupConformances(
     nominal,
-    const_cast<DeclContext *>(this),
+    const_cast<GenericContext *>(dc),
     ConformanceLookupKind::All,
     nullptr,
     nullptr,

lib/Sema/TypeCheckProtocol.cpp

@@ -5103,7 +5103,7 @@ void TypeChecker::checkConformancesInContext(DeclContext *dc,
                     groupChecker.getUnsatisfiedRequirements().end());
 
   // Diagnose any conflicts attributed to this declaration context.
-  for (const auto &diag : dc->takeConformanceDiagnostics()) {
+  for (const auto &diag : idc->takeConformanceDiagnostics()) {
     // Figure out the declaration of the existing conformance.
     Decl *existingDecl = dyn_cast<NominalTypeDecl>(diag.ExistingDC);
     if (!existingDecl)