3 files changed, 14 insertions, 13 deletions

diff --git a/polly/lib/Analysis/ScopInfo.cpp b/polly/lib/Analysis/ScopInfo.cpp
index 37f6a7a3e20..28274fbc2bd 100644
--- a/polly/lib/Analysis/ScopInfo.cpp
+++ b/polly/lib/Analysis/ScopInfo.cpp
@@ -66,7 +66,7 @@ STATISTIC(RichScopFound, "Number of Scops containing a loop");
 // The maximal number of basic sets we allow during domain construction to
 // be created. More complex scops will result in very high compile time and
 // are also unlikely to result in good code
-static int const MaxConjunctsInDomain = 20;
+static int const MaxDisjunctionsInDomain = 20;
 
 static cl::opt<bool> PollyRemarksMinimal(
     "polly-remarks-minimal",
@@ -1340,12 +1340,13 @@ buildConditionSets(ScopStmt &Stmt, Value *Condition, TerminatorInst *TI,
 
   isl_set *AlternativeCondSet = nullptr;
   bool ToComplex =
-      isl_set_n_basic_set(ConsequenceCondSet) >= MaxConjunctsInDomain;
+      isl_set_n_basic_set(ConsequenceCondSet) >= MaxDisjunctionsInDomain;
 
   if (!ToComplex) {
     AlternativeCondSet = isl_set_subtract(isl_set_copy(Domain),
                                           isl_set_copy(ConsequenceCondSet));
-    ToComplex = isl_set_n_basic_set(AlternativeCondSet) >= MaxConjunctsInDomain;
+    ToComplex =
+        isl_set_n_basic_set(AlternativeCondSet) >= MaxDisjunctionsInDomain;
   }
 
   if (ToComplex) {
@@ -2095,7 +2096,7 @@ static isl_stat buildMinMaxAccess(__isl_take isl_set *Set, void *User) {
 
   Set = isl_set_remove_divs(Set);
 
-  if (isl_set_n_basic_set(Set) >= MaxConjunctsInDomain) {
+  if (isl_set_n_basic_set(Set) >= MaxDisjunctionsInDomain) {
     isl_set_free(Set);
     return isl_stat_error;
   }
@@ -2419,9 +2420,9 @@ void Scop::propagateInvalidStmtDomains(Region *R, ScopDetection &SD,
       unsigned NumConjucts = isl_set_n_basic_set(SuccInvalidDomain);
       SuccStmt->setInvalidDomain(SuccInvalidDomain);
 
-      // Check if the maximal number of domain conjuncts was reached.
+      // Check if the maximal number of domain disjunctions was reached.
       // In case this happens we will bail.
-      if (NumConjucts < MaxConjunctsInDomain)
+      if (NumConjucts < MaxDisjunctionsInDomain)
         continue;
 
       isl_set_free(InvalidDomain);
@@ -2597,9 +2598,9 @@ bool Scop::buildDomainsWithBranchConstraints(Region *R, ScopDetection &SD,
         SuccDomain = CondSet;
       }
 
-      // Check if the maximal number of domain conjuncts was reached.
+      // Check if the maximal number of domain disjunctions was reached.
       // In case this happens we will clean up and bail.
-      if (isl_set_n_basic_set(SuccDomain) < MaxConjunctsInDomain)
+      if (isl_set_n_basic_set(SuccDomain) < MaxDisjunctionsInDomain)
         continue;
 
       invalidate(COMPLEXITY, DebugLoc());
@@ -3280,7 +3281,7 @@ void Scop::addInvariantLoads(ScopStmt &Stmt, MemoryAccessList &InvMAs) {
   isl_set *DomainCtx = isl_set_params(Stmt.getDomain());
   DomainCtx = isl_set_subtract(DomainCtx, StmtInvalidCtx);
 
-  if (isl_set_n_basic_set(DomainCtx) >= MaxConjunctsInDomain) {
+  if (isl_set_n_basic_set(DomainCtx) >= MaxDisjunctionsInDomain) {
     auto *AccInst = InvMAs.front()->getAccessInstruction();
     invalidate(COMPLEXITY, AccInst->getDebugLoc());
     isl_set_free(DomainCtx);
diff --git a/polly/lib/CodeGen/IslNodeBuilder.cpp b/polly/lib/CodeGen/IslNodeBuilder.cpp
index b4787893443..fd647a1e218 100644
--- a/polly/lib/CodeGen/IslNodeBuilder.cpp
+++ b/polly/lib/CodeGen/IslNodeBuilder.cpp
@@ -52,7 +52,7 @@ using namespace llvm;
 // More complex access ranges will result in very high compile time and are also
 // unlikely to result in good code. This value is very high and should only
 // trigger for corner cases (e.g., the "dct_luma" function in h264, SPEC2006).
-static int const MaxConjunctsInAccessRange = 80;
+static int const MaxDisjunctionsInAccessRange = 80;
 
 __isl_give isl_ast_expr *
 IslNodeBuilder::getUpperBound(__isl_keep isl_ast_node *For,
@@ -925,7 +925,7 @@ bool IslNodeBuilder::materializeParameters(isl_set *Set, bool All) {
 Value *IslNodeBuilder::preloadUnconditionally(isl_set *AccessRange,
                                               isl_ast_build *Build,
                                               Instruction *AccInst) {
-  if (isl_set_n_basic_set(AccessRange) > MaxConjunctsInAccessRange) {
+  if (isl_set_n_basic_set(AccessRange) > MaxDisjunctionsInAccessRange) {
     isl_set_free(AccessRange);
     return nullptr;
   }
diff --git a/polly/lib/Support/SCEVAffinator.cpp b/polly/lib/Support/SCEVAffinator.cpp
index 40c0280f865..c8268cfea68 100644
--- a/polly/lib/Support/SCEVAffinator.cpp
+++ b/polly/lib/Support/SCEVAffinator.cpp
@@ -34,7 +34,7 @@ static cl::opt<bool> IgnoreIntegerWrapping(
 // The maximal number of basic sets we allow during the construction of a
 // piecewise affine function. More complex ones will result in very high
 // compile time.
-static int const MaxConjunctsInPwAff = 100;
+static int const MaxDisjunctionsInPwAff = 100;
 
 // The maximal number of bits for which a zero-extend is modeled precisely.
 static unsigned const MaxZextSmallBitWidth = 7;
@@ -71,7 +71,7 @@ static __isl_give PWACtx copyPWACtx(const __isl_keep PWACtx &PWAC) {
 static bool isTooComplex(PWACtx &PWAC) {
   unsigned NumBasicSets = 0;
   isl_pw_aff_foreach_piece(PWAC.first, addNumBasicSets, &NumBasicSets);
-  if (NumBasicSets <= MaxConjunctsInPwAff)
+  if (NumBasicSets <= MaxDisjunctionsInPwAff)
     return false;
   freePWACtx(PWAC);
   return true;