RequirementMachine: Check invariants in noassert builds

Author: slavapestov

lib/AST/RequirementMachine/HomotopyReduction.cpp

@@ -864,18 +864,15 @@ RewriteSystem::getMinimizedGenericSignatureRules() const {
 
 /// Verify that each loop begins and ends at its basepoint.
 void RewriteSystem::verifyRewriteLoops() const {
-#ifndef NDEBUG
   for (const auto &loop : Loops) {
     loop.verify(*this);
   }
-#endif
 }
 
 /// Assert if homotopy reduction failed to eliminate a redundant conformance,
 /// since this suggests a misunderstanding on my part.
 void RewriteSystem::verifyRedundantConformances(
     const llvm::DenseSet<unsigned> &redundantConformances) const {
-#ifndef NDEBUG
   for (unsigned ruleID : redundantConformances) {
     const auto &rule = getRule(ruleID);
     assert(!rule.isPermanent() &&
@@ -893,14 +890,12 @@ void RewriteSystem::verifyRedundantConformances(
       abort();
     }
   }
-#endif
 }
 
 // Assert if homotopy reduction failed to eliminate a rewrite rule it was
 // supposed to delete.
 void RewriteSystem::verifyMinimizedRules(
     const llvm::DenseSet<unsigned> &redundantConformances) const {
-#ifndef NDEBUG
   unsigned redundantRuleCount = 0;
 
   for (unsigned ruleID : indices(Rules)) {
@@ -982,5 +977,4 @@ void RewriteSystem::verifyMinimizedRules(
       abort();
     }
   }
-#endif
 }

lib/AST/RequirementMachine/MinimalConformances.cpp

@@ -742,7 +742,6 @@ void MinimalConformances::dumpMinimalConformanceEquation(
 }
 
 void MinimalConformances::verifyMinimalConformanceEquations() const {
-#ifndef NDEBUG
   for (const auto &pair : ConformancePaths) {
     const auto &rule = System.getRule(pair.first);
     auto *proto = rule.getLHS().back().getProtocol();
@@ -804,7 +803,6 @@ void MinimalConformances::verifyMinimalConformanceEquations() const {
       }
     }
   }
-#endif
 }
 
 bool MinimalConformances::isDerivedViaCircularConformanceRule(
@@ -884,7 +882,6 @@ void MinimalConformances::computeMinimalConformances() {
 
 /// Check invariants.
 void MinimalConformances::verifyMinimalConformances() const {
-#ifndef NDEBUG
   for (const auto &pair : ConformancePaths) {
     unsigned ruleID = pair.first;
     const auto &rule = System.getRule(ruleID);
@@ -913,7 +910,6 @@ void MinimalConformances::verifyMinimalConformances() const {
       abort();
     }
   }
-#endif
 }
 
 void MinimalConformances::dumpMinimalConformances(

lib/AST/RequirementMachine/RewriteLoop.cpp

@@ -203,7 +203,6 @@ void RewritePath::dumpLong(llvm::raw_ostream &out,
 }
 
 void RewriteLoop::verify(const RewriteSystem &system) const {
-#ifndef NDEBUG
   RewritePathEvaluator evaluator(Basepoint);
 
   for (const auto &step : Path) {
@@ -222,7 +221,6 @@ void RewriteLoop::verify(const RewriteSystem &system) const {
     evaluator.dump(llvm::errs());
     abort();
   }
-#endif
 }
 
 void RewriteLoop::dump(llvm::raw_ostream &out,

lib/AST/RequirementMachine/RewriteSystem.cpp

@@ -631,14 +631,12 @@ void RewriteSystem::recordRewriteLoop(MutableTerm basepoint,
 }
 
 void RewriteSystem::verifyRewriteRules(ValidityPolicy policy) const {
-#ifndef NDEBUG
-
 #define ASSERT_RULE(expr) \
   if (!(expr)) { \
     llvm::errs() << "&&& Malformed rewrite rule: " << rule << "\n"; \
     llvm::errs() << "&&& " << #expr << "\n\n"; \
     dump(llvm::errs()); \
-    assert(expr); \
+    abort(); \
   }
 
   for (const auto &rule : Rules) {
@@ -705,7 +703,6 @@ void RewriteSystem::verifyRewriteRules(ValidityPolicy policy) const {
   }
 
 #undef ASSERT_RULE
-#endif
 }
 
 void RewriteSystem::dump(llvm::raw_ostream &out) const {

lib/AST/RequirementMachine/TypeDifference.cpp

@@ -78,8 +78,6 @@ void TypeDifference::dump(llvm::raw_ostream &out) const {
 }
 
 void TypeDifference::verify(RewriteContext &ctx) const {
-#ifndef NDEBUG
-
 #define VERIFY(expr, str) \
   if (!(expr)) { \
     llvm::errs() << "TypeDifference::verify(): " << str << "\n"; \
@@ -113,7 +111,6 @@ void TypeDifference::verify(RewriteContext &ctx) const {
   }
 
 #undef VERIFY
-#endif
 }
 
 namespace {
@@ -213,8 +210,6 @@ namespace {
     }
 
     void verify() const {
-#ifndef NDEBUG
-
 #define VERIFY(expr, str) \
   if (!(expr)) { \
     llvm::errs() << "ConcreteTypeMatcher::verify(): " << str << "\n"; \
@@ -258,7 +253,6 @@ namespace {
       }
 
 #undef VERIFY
-#endif
     }
 
     void dump(llvm::raw_ostream &out) const {
@@ -460,7 +454,6 @@ RewriteSystem::computeTypeDifference(Term baseTerm, Symbol lhs, Symbol rhs,
 
   bool isConflict = (matcher.ConcreteConflicts.size() > 0);
 
-#ifndef NDEBUG
   if (!isConflict) {
     // The meet operation should be commutative.
     if (lhsMeetRhs.RHS != rhsMeetLhs.RHS) {
@@ -523,7 +516,6 @@ RewriteSystem::computeTypeDifference(Term baseTerm, Symbol lhs, Symbol rhs,
       }
     }
   }
-#endif
 
   if (lhs != lhsMeetRhs.RHS)
     lhsDifferenceID = recordTypeDifference(lhsMeetRhs);