[REFACTOR] Simplify the SCoP detection interface a bit
llvm-svn: 229879
diff --git a/polly/lib/Analysis/ScopDetection.cpp b/polly/lib/Analysis/ScopDetection.cpp
index 8ef657a..954dd95 100644
--- a/polly/lib/Analysis/ScopDetection.cpp
+++ b/polly/lib/Analysis/ScopDetection.cpp
@@ -251,8 +251,10 @@
if (!ValidRegions.count(&R))
return false;
- if (Verify)
- return isValidRegion(const_cast<Region &>(R));
+ if (Verify) {
+ DetectionContext Context(const_cast<Region &>(R), *AA, false /*verifying*/);
+ return isValidRegion(Context);
+ }
return true;
}
@@ -731,10 +733,14 @@
if (!DetectRegionsWithoutLoops && regionWithoutLoops(R, LI))
return;
- bool IsValidRegion = isValidRegion(R);
- bool HasErrors = RejectLogs.count(&R) > 0;
+ DetectionContext Context(R, *AA, false /*verifying*/);
+ bool RegionIsValid = isValidRegion(Context);
+ bool HasErrors = !RegionIsValid || Context.Log.size() > 0;
- if (IsValidRegion && !HasErrors) {
+ if (PollyTrackFailures && HasErrors)
+ RejectLogs.insert(std::make_pair(&R, Context.Log));
+
+ if (!HasErrors) {
++ValidRegion;
ValidRegions.insert(&R);
return;
@@ -817,18 +823,6 @@
return true;
}
-bool ScopDetection::isValidRegion(Region &R) const {
- DetectionContext Context(R, *AA, false /*verifying*/);
-
- bool RegionIsValid = isValidRegion(Context);
- bool HasErrors = !RegionIsValid || Context.Log.size() > 0;
-
- if (PollyTrackFailures && HasErrors)
- RejectLogs.insert(std::make_pair(&R, Context.Log));
-
- return RegionIsValid;
-}
-
bool ScopDetection::isValidRegion(DetectionContext &Context) const {
Region &R = Context.CurRegion;