[Macros] Remove the ExpandConformanceMacros request.

Author: hborla

include/swift/AST/TypeCheckRequests.h

@@ -4031,28 +4031,6 @@ class ExpandAccessorMacros
   void noteCycleStep(DiagnosticEngine &diags) const;
 };
 
-/// Expand all conformance macros attached to the given declaration.
-///
-/// Produces the set of macro expansion buffer IDs.
-class ExpandConformanceMacros
-    : public SimpleRequest<ExpandConformanceMacros,
-                           ArrayRef<unsigned>(NominalTypeDecl *),
-                           RequestFlags::Cached> {
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  ArrayRef<unsigned> evaluate(Evaluator &evaluator,
-                              NominalTypeDecl *nominal) const;
-
-public:
-  bool isCached() const { return true; }
-  void diagnoseCycle(DiagnosticEngine &diags) const;
-  void noteCycleStep(DiagnosticEngine &diags) const;
-};
-
 /// Expand all extension macros attached to the given declaration.
 ///
 /// Produces the set of macro expansion buffer IDs.

include/swift/AST/TypeCheckerTypeIDZone.def

@@ -457,9 +457,6 @@ SWIFT_REQUEST(TypeChecker, ExpandMemberAttributeMacros,
 SWIFT_REQUEST(TypeChecker, ExpandAccessorMacros,
               ArrayRef<unsigned>(AbstractStorageDecl *),
               Cached, NoLocationInfo)
-SWIFT_REQUEST(TypeChecker, ExpandConformanceMacros,
-              ArrayRef<unsigned>(NominalTypeDecl *),
-              Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, ExpandExtensionMacros,
               ArrayRef<unsigned>(NominalTypeDecl *),
               Cached, NoLocationInfo)

lib/AST/TypeCheckRequests.cpp

@@ -1857,22 +1857,6 @@ void ExpandAccessorMacros::noteCycleStep(DiagnosticEngine &diags) const {
                  decl->getName());
 }
 
-void ExpandConformanceMacros::diagnoseCycle(DiagnosticEngine &diags) const {
-  auto decl = std::get<0>(getStorage());
-  diags.diagnose(decl->getLoc(),
-                 diag::macro_expand_circular_reference_entity,
-                 "conformance",
-                 decl->getName());
-}
-
-void ExpandConformanceMacros::noteCycleStep(DiagnosticEngine &diags) const {
-  auto decl = std::get<0>(getStorage());
-  diags.diagnose(decl->getLoc(),
-                 diag::macro_expand_circular_reference_entity_through,
-                 "conformance",
-                 decl->getName());
-}
-
 void ExpandExtensionMacros::diagnoseCycle(DiagnosticEngine &diags) const {
   auto decl = std::get<0>(getStorage());
   diags.diagnose(decl->getLoc(),

lib/Sema/TypeCheckMacros.cpp

@@ -1456,21 +1456,6 @@ llvm::Optional<unsigned> swift::expandPeers(CustomAttr *attr, MacroDecl *macro,
   return macroSourceFile->getBufferID();
 }
 
-ArrayRef<unsigned>
-ExpandConformanceMacros::evaluate(Evaluator &evaluator,
-                                  NominalTypeDecl *nominal) const {
-  SmallVector<unsigned, 2> bufferIDs;
-  nominal->forEachAttachedMacro(MacroRole::Conformance,
-      [&](CustomAttr *attr, MacroDecl *macro) {
-        if (auto bufferID = expandExtensions(attr, macro,
-                                             MacroRole::Conformance,
-                                             nominal))
-          bufferIDs.push_back(*bufferID);
-      });
-
-  return nominal->getASTContext().AllocateCopy(bufferIDs);
-}
-
 ArrayRef<unsigned>
 ExpandExtensionMacros::evaluate(Evaluator &evaluator,
                                 NominalTypeDecl *nominal) const {