RequirementMachine: Skip imported rules in various places when iterating over all rules

Author: slavapestov

lib/AST/RequirementMachine/HomotopyReduction.cpp

@@ -682,7 +682,8 @@ RewriteSystem::getMinimizedProtocolRules() const {
   assert(!Protos.empty());
 
   llvm::DenseMap<const ProtocolDecl *, MinimizedProtocolRules> rules;
-  for (unsigned ruleID : indices(Rules)) {
+  for (unsigned ruleID = FirstLocalRule, e = Rules.size();
+       ruleID < e; ++ruleID) {
     const auto &rule = getRule(ruleID);
 
     if (rule.isPermanent() ||
@@ -713,7 +714,8 @@ RewriteSystem::getMinimizedGenericSignatureRules() const {
   assert(Protos.empty());
 
   std::vector<unsigned> rules;
-  for (unsigned ruleID : indices(Rules)) {
+  for (unsigned ruleID = FirstLocalRule, e = Rules.size();
+       ruleID < e; ++ruleID) {
     const auto &rule = getRule(ruleID);
 
     if (rule.isPermanent() ||
@@ -768,7 +770,8 @@ void RewriteSystem::verifyMinimizedRules(
     const llvm::DenseSet<unsigned> &redundantConformances) const {
   unsigned redundantRuleCount = 0;
 
-  for (unsigned ruleID : indices(Rules)) {
+  for (unsigned ruleID = FirstLocalRule, e = Rules.size();
+       ruleID < e; ++ruleID) {
     const auto &rule = getRule(ruleID);
 
     // Ignore the rewrite rule if it is not part of our minimization domain.

lib/AST/RequirementMachine/KnuthBendix.cpp

@@ -301,7 +301,7 @@ RewriteSystem::computeConfluentCompletion(unsigned maxRuleCount,
     ruleCount = Rules.size();
 
     // For every rule, looking for other rules that overlap with this rule.
-    for (unsigned i = 0, e = Rules.size(); i < e; ++i) {
+    for (unsigned i = FirstLocalRule, e = Rules.size(); i < e; ++i) {
       const auto &lhs = getRule(i);
       if (lhs.isLHSSimplified() ||
           lhs.isRHSSimplified() ||

lib/AST/RequirementMachine/RewriteSystem.cpp

@@ -337,7 +337,7 @@ bool RewriteSystem::addExplicitRule(MutableTerm lhs, MutableTerm rhs,
 void RewriteSystem::simplifyLeftHandSides() {
   assert(Complete);
 
-  for (unsigned ruleID = 0, e = Rules.size(); ruleID < e; ++ruleID) {
+  for (unsigned ruleID = FirstLocalRule, e = Rules.size(); ruleID < e; ++ruleID) {
     auto &rule = getRule(ruleID);
     if (rule.isLHSSimplified())
       continue;
@@ -380,7 +380,7 @@ void RewriteSystem::simplifyLeftHandSides() {
 void RewriteSystem::simplifyRightHandSides() {
   assert(Complete);
 
-  for (unsigned ruleID = 0, e = Rules.size(); ruleID < e; ++ruleID) {
+  for (unsigned ruleID = FirstLocalRule, e = Rules.size(); ruleID < e; ++ruleID) {
     auto &rule = getRule(ruleID);
     if (rule.isRHSSimplified())
       continue;
@@ -478,7 +478,7 @@ void RewriteSystem::verifyRewriteRules(ValidityPolicy policy) const {
     abort(); \
   }
 
-  for (const auto &rule : Rules) {
+  for (const auto &rule : getLocalRules()) {
     const auto &lhs = rule.getLHS();
     const auto &rhs = rule.getRHS();
 
@@ -585,7 +585,8 @@ void RewriteSystem::computeRedundantRequirementDiagnostics(
   // Collect non-explicit requirements that are not redundant.
   llvm::SmallDenseSet<unsigned, 2> impliedRequirements;
 
-  for (unsigned ruleID : indices(getRules())) {
+  for (unsigned ruleID = FirstLocalRule, e = Rules.size();
+       ruleID < e; ++ruleID) {
     auto &rule = getRules()[ruleID];
 
     if (!rule.getRequirementID().hasValue() &&

lib/AST/RequirementMachine/SimplifySubstitutions.cpp

@@ -378,7 +378,7 @@ RewriteSystem::simplifySubstitutions(Term baseTerm, Symbol symbol,
 /// is built, and a final simplification pass is performed with \p map set to
 /// the new property map.
 void RewriteSystem::simplifyLeftHandSideSubstitutions(const PropertyMap *map) {
-  for (unsigned ruleID = 0, e = Rules.size(); ruleID < e; ++ruleID) {
+  for (unsigned ruleID = FirstLocalRule, e = Rules.size(); ruleID < e; ++ruleID) {
     auto &rule = getRule(ruleID);
     if (rule.isSubstitutionSimplified())
       continue;