AST: Remove ASTContext::getOrCreateRequirementMachine() in favor of getRewriteContext()

Author: slavapestov

include/swift/AST/ASTContext.h

@@ -140,7 +140,7 @@ namespace namelookup {
 }
 
 namespace rewriting {
-  class RequirementMachine;
+  class RewriteContext;
 }
 
 namespace syntax {
@@ -1215,21 +1215,13 @@ class ASTContext final {
   GenericSignatureBuilder *getOrCreateGenericSignatureBuilder(
                                                      CanGenericSignature sig);
 
-  /// Retrieve or create a term rewriting system for answering queries on
-  /// type parameters written against the given generic signature.
-  rewriting::RequirementMachine *getOrCreateRequirementMachine(
-      CanGenericSignature sig);
+  rewriting::RewriteContext &getRewriteContext();
 
   /// This is a hack to break cycles. Don't introduce new callers of this
   /// method.
   bool isRecursivelyConstructingRequirementMachine(
       CanGenericSignature sig);
 
-  /// Retrieve or create a term rewriting system for answering queries on
-  /// type parameters written against the given protocol requirement signature.
-  rewriting::RequirementMachine *getOrCreateRequirementMachine(
-      const ProtocolDecl *proto);
-
   /// Retrieve a generic signature with a single unconstrained type parameter,
   /// like `<T>`.
   CanGenericSignature getSingleGenericParameterSignature() const;

lib/AST/ASTContext.cpp

@@ -2003,31 +2003,18 @@ GenericSignatureBuilder *ASTContext::getOrCreateGenericSignatureBuilder(
   return builder;
 }
 
-rewriting::RequirementMachine *
-ASTContext::getOrCreateRequirementMachine(CanGenericSignature sig) {
+rewriting::RewriteContext &
+ASTContext::getRewriteContext() {
   auto &rewriteCtx = getImpl().TheRewriteContext;
   if (!rewriteCtx)
     rewriteCtx.reset(new rewriting::RewriteContext(*this));
 
-  return rewriteCtx->getRequirementMachine(sig);
+  return *rewriteCtx;
 }
 
 bool ASTContext::isRecursivelyConstructingRequirementMachine(
       CanGenericSignature sig) {
-  auto &rewriteCtx = getImpl().TheRewriteContext;
-  if (!rewriteCtx)
-    return false;
-
-  return rewriteCtx->isRecursivelyConstructingRequirementMachine(sig);
-}
-
-rewriting::RequirementMachine *
-ASTContext::getOrCreateRequirementMachine(const ProtocolDecl *proto) {
-  auto &rewriteCtx = getImpl().TheRewriteContext;
-  if (!rewriteCtx)
-    rewriteCtx.reset(new rewriting::RewriteContext(*this));
-
-  return rewriteCtx->getRequirementMachine(proto);
+  return getRewriteContext().isRecursivelyConstructingRequirementMachine(sig);
 }
 
 Optional<llvm::TinyPtrVector<ValueDecl *>>

lib/AST/GenericSignature.cpp

@@ -199,7 +199,7 @@ GenericSignatureImpl::getRequirementMachine() const {
     return Machine;
 
   const_cast<GenericSignatureImpl *>(this)->Machine
-      = getASTContext().getOrCreateRequirementMachine(
+      = getASTContext().getRewriteContext().getRequirementMachine(
           getCanonicalSignature());
   return Machine;
 }

lib/AST/RequirementMachine/RequirementMachineRequests.cpp

@@ -233,7 +233,7 @@ RequirementSignatureRequestRQM::evaluate(Evaluator &evaluator,
 
   // We build requirement signatures for all protocols in a strongly connected
   // component at the same time.
-  auto *machine = ctx.getOrCreateRequirementMachine(proto);
+  auto *machine = ctx.getRewriteContext().getRequirementMachine(proto);
   auto requirements = machine->computeMinimalProtocolRequirements();
 
   bool debug = machine->getDebugOptions().contains(DebugFlags::Minimization);