Merge pull request #59861 from slavapestov/rqm-new-minimal-conformances

RequirementMachine: New minimal conformances algorithm

Author: slavapestov

lib/AST/RequirementMachine/Debug.h

@@ -51,30 +51,33 @@ enum class DebugFlags : unsigned {
   /// Print debug output from the minimal conformances algorithm.
   MinimalConformances = (1<<9),
 
+  /// Print more detailed debug output from the minimal conformances algorithm.
+  MinimalConformancesDetail = (1<<10),
+
   /// Print debug output from the protocol dependency graph.
-  ProtocolDependencies = (1<<10),
+  ProtocolDependencies = (1<<11),
 
   /// Print debug output from generic signature minimization.
-  Minimization = (1<<11),
+  Minimization = (1<<12),
 
   /// Print redundant rules and their replacement paths.
-  RedundantRules = (1<<12),
+  RedundantRules = (1<<13),
 
   /// Print more detail about redundant rules.
-  RedundantRulesDetail = (1<<13),
+  RedundantRulesDetail = (1<<14),
 
   /// Print debug output from the concrete contraction pre-processing pass.
-  ConcreteContraction = (1<<14),
+  ConcreteContraction = (1<<15),
 
   /// Print debug output from propagating explicit requirement
   /// IDs from redundant rules.
-  PropagateRequirementIDs = (1<<15),
+  PropagateRequirementIDs = (1<<16),
 
   /// Print a trace of requirement machines constructed and how long each took.
-  Timers = (1<<16),
+  Timers = (1<<17),
 
   /// Print conflicting rules.
-  ConflictingRules = (1<<17),
+  ConflictingRules = (1<<18),
 };
 
 using DebugOptions = OptionSet<DebugFlags>;

lib/AST/RequirementMachine/HomotopyReduction.cpp

@@ -61,6 +61,7 @@
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
 #include <algorithm>
+#include "PropertyMap.h"
 #include "RewriteContext.h"
 #include "RewriteSystem.h"
 
@@ -452,7 +453,7 @@ void RewriteSystem::performHomotopyReduction(
 /// is deleted.
 ///
 /// Redundant rules are mutated to set their isRedundant() bit.
-void RewriteSystem::minimizeRewriteSystem() {
+void RewriteSystem::minimizeRewriteSystem(const PropertyMap &map) {
   if (Debug.contains(DebugFlags::HomotopyReduction)) {
     llvm::dbgs() << "-----------------------------\n";
     llvm::dbgs() << "- Minimizing rewrite system -\n";
@@ -538,7 +539,7 @@ void RewriteSystem::minimizeRewriteSystem() {
   // compute conformance access paths, instead of the current "brute force"
   // algorithm used for that purpose.
   llvm::DenseSet<unsigned> redundantConformances;
-  computeMinimalConformances(redundantConformances);
+  computeMinimalConformances(map, redundantConformances);
 
   // Third pass: Eliminate all non-minimal conformance rules.
   if (Debug.contains(DebugFlags::HomotopyReduction)) {