[Refactor] Simplify ScopPass interface

llvm-svn: 230899

diff --git a/polly/include/polly/ScopPass.h b/polly/include/polly/ScopPass.h
index 55734af..173b580 100644 (file)
--- a/polly/include/polly/ScopPass.h
+++ b/polly/include/polly/ScopPass.h
@@ -49,12 +49,6 @@ protected:
   ///
   virtual void getAnalysisUsage(AnalysisUsage &AU) const override;
 
-public:
-  Scop &getCurScop() const {
-    assert(S && "Not on a Scop!");
-    return *S;
-  }
-
 private:
   bool runOnRegion(Region *R, RGPassManager &RGM) override;
   void print(raw_ostream &OS, const Module *) const override;

diff --git a/polly/lib/Analysis/Dependences.cpp b/polly/lib/Analysis/Dependences.cpp
index a136359..437b365 100644 (file)
--- a/polly/lib/Analysis/Dependences.cpp
+++ b/polly/lib/Analysis/Dependences.cpp
@@ -444,7 +444,7 @@ bool Dependences::runOnScop(Scop &ScopVar) {
 }
 
 bool Dependences::isValidScattering(StatementToIslMapTy *NewScattering) {
-  Scop &S = getCurScop();
+  Scop &S = *this->S;
 
   if (LegalityCheckDisabled)
     return true;