Merge pull request swiftlang#39255 from slavapestov/rqm-homotopy-generators

RequirementMachine: Homotopy reduction

Author: slavapestov

lib/AST/CMakeLists.txt

@@ -74,6 +74,7 @@ add_swift_host_library(swiftAST STATIC
   ProtocolConformance.cpp
   RawComment.cpp
   RequirementEnvironment.cpp
+  RequirementMachine/HomotopyReduction.cpp
   RequirementMachine/GenericSignatureQueries.cpp
   RequirementMachine/PropertyMap.cpp
   RequirementMachine/ProtocolGraph.cpp

lib/AST/RequirementMachine/Debug.h

@@ -13,6 +13,8 @@
 #ifndef SWIFT_RQM_DEBUG_H
 #define SWIFT_RQM_DEBUG_H
 
+#include "swift/Basic/OptionSet.h"
+
 namespace swift {
 
 namespace rewriting {
@@ -34,7 +36,10 @@ enum class DebugFlags : unsigned {
   ConcreteUnification = (1<<4),
 
   /// Print debug output when concretizing nested types in the property map.
-  ConcretizeNestedTypes = (1<<5)
+  ConcretizeNestedTypes = (1<<5),
+
+  /// Print debug output from the homotopy reduction algorithm.
+  HomotopyReduction = (1<<6)
 };
 
 using DebugOptions = OptionSet<DebugFlags>;
@@ -43,4 +48,4 @@ using DebugOptions = OptionSet<DebugFlags>;
 
 }
 
-#endif
+#endif