Merge remote-tracking branch 'origin/main' into next

Author: swift-ci

lib/AST/CMakeLists.txt

@@ -71,11 +71,12 @@ add_swift_host_library(swiftAST STATIC
   PlatformKind.cpp
   PrettyStackTrace.cpp
   ProtocolConformance.cpp
-  ProtocolGraph.cpp
   RawComment.cpp
   RequirementEnvironment.cpp
-  RequirementMachine.cpp
-  RewriteSystem.cpp
+  RequirementMachine/ProtocolGraph.cpp
+  RequirementMachine/RequirementMachine.cpp
+  RequirementMachine/RewriteSystem.cpp
+  RequirementMachine/RewriteSystemCompletion.cpp
   SILLayout.cpp
   Stmt.cpp
   SubstitutionMap.cpp

lib/AST/ProtocolGraph.cpp renamed to lib/AST/RequirementMachine/ProtocolGraph.cpp

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "swift/AST/ProtocolGraph.h"
+#include "ProtocolGraph.h"
 
 #include "swift/AST/Decl.h"
 #include "swift/AST/Requirement.h"
@@ -211,4 +211,4 @@ bool ProtocolGraph::inheritsFrom(const ProtocolDecl *thisProto,
   return std::find(info.AllInherited.begin(),
                    info.AllInherited.end(),
                    otherProto) != info.AllInherited.end();
-}
+}

include/swift/AST/ProtocolGraph.h renamed to lib/AST/RequirementMachine/ProtocolGraph.h

@@ -15,13 +15,14 @@
 #include "swift/AST/Decl.h"
 #include "swift/AST/GenericSignature.h"
 #include "swift/AST/PrettyStackTrace.h"
-#include "swift/AST/ProtocolGraph.h"
 #include "swift/AST/Requirement.h"
-#include "swift/AST/RewriteSystem.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/TinyPtrVector.h"
 #include <vector>
 
+#include "ProtocolGraph.h"
+#include "RewriteSystem.h"
+
 using namespace swift;
 using namespace rewriting;
 
@@ -303,4 +304,4 @@ void RequirementMachine::markComplete() {
   }
   assert(!Impl->Complete);
   Impl->Complete = true;
-}
+}