[llvm-commits] [polly] r156203 - in /polly/trunk/lib: Analysis/ScopDetection.cpp Analysis/ScopGraphPrinter.cpp Analysis/TempScopInfo.cpp IndependentBlocks.cpp

[Chandler Carruth]

Author: chandlerc
Date: Fri May  4 15:57:29 2012
New Revision: 156203

URL: http://llvm.org/viewvc/llvm-project?rev=156203&view=rev
Log:
Update Polly to match the LLVM interface change in r156196.

Modified:
    polly/trunk/lib/Analysis/ScopDetection.cpp
    polly/trunk/lib/Analysis/ScopGraphPrinter.cpp
    polly/trunk/lib/Analysis/TempScopInfo.cpp
    polly/trunk/lib/IndependentBlocks.cpp

Modified: polly/trunk/lib/Analysis/ScopDetection.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopDetection.cpp?rev=156203&r1=156202&r2=156203&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/ScopDetection.cpp (original)
+++ polly/trunk/lib/Analysis/ScopDetection.cpp Fri May  4 15:57:29 2012
@@ -482,7 +482,7 @@
 
   for (Region::block_iterator I = R.block_begin(), E = R.block_end(); I != E;
        ++I)
-    if (!isValidBasicBlock(*(I->getNodeAs<BasicBlock>()), Context))
+    if (!isValidBasicBlock(*I, Context))
       return false;
 
   return true;

Modified: polly/trunk/lib/Analysis/ScopGraphPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopGraphPrinter.cpp?rev=156203&r1=156202&r2=156203&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/ScopGraphPrinter.cpp (original)
+++ polly/trunk/lib/Analysis/ScopGraphPrinter.cpp Fri May  4 15:57:29 2012
@@ -134,13 +134,11 @@
     RegionInfo *RI = R->getRegionInfo();
 
     for (Region::const_block_iterator BI = R->block_begin(),
-         BE = R->block_end(); BI != BE; ++BI) {
-      BasicBlock *BB = (*BI)->getNodeAs<BasicBlock>();
-      if (RI->getRegionFor(BB) == R)
+         BE = R->block_end(); BI != BE; ++BI)
+      if (RI->getRegionFor(*BI) == R)
         O.indent(2 * (depth + 1)) << "Node"
-          << static_cast<const void*>(RI->getTopLevelRegion()->getBBNode(BB))
+          << static_cast<const void*>(RI->getTopLevelRegion()->getBBNode(*BI))
           << ";\n";
-    }
 
     O.indent(2 * depth) << "}\n";
   }

Modified: polly/trunk/lib/Analysis/TempScopInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/TempScopInfo.cpp?rev=156203&r1=156202&r2=156203&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/TempScopInfo.cpp (original)
+++ polly/trunk/lib/Analysis/TempScopInfo.cpp Fri May  4 15:57:29 2012
@@ -124,7 +124,7 @@
 
   for (Region::block_iterator I = R.block_begin(), E = R.block_end();
        I != E; ++I) {
-    Loop *L = LI->getLoopFor(I->getNodeAs<BasicBlock>());
+    Loop *L = LI->getLoopFor(*I);
 
     if (!L || !R.contains(L))
       continue;
@@ -232,9 +232,8 @@
 
   for (Region::block_iterator I = R.block_begin(), E = R.block_end();
        I != E; ++I) {
-    BasicBlock *BB =  I->getNodeAs<BasicBlock>();
-    buildAccessFunctions(R, *BB);
-    buildCondition(BB, R.getEntry(), *TScop);
+    buildAccessFunctions(R, *I);
+    buildCondition(*I, R.getEntry(), *TScop);
   }
 
   buildLoopBounds(*TScop);

Modified: polly/trunk/lib/IndependentBlocks.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/IndependentBlocks.cpp?rev=156203&r1=156202&r2=156203&view=diff
==============================================================================
--- polly/trunk/lib/IndependentBlocks.cpp (original)
+++ polly/trunk/lib/IndependentBlocks.cpp Fri May  4 15:57:29 2012
@@ -262,7 +262,7 @@
 
   for (Region::const_block_iterator SI = R->block_begin(), SE = R->block_end();
        SI != SE; ++SI)
-    Changed |= createIndependentBlocks((*SI)->getNodeAs<BasicBlock>(), R);
+    Changed |= createIndependentBlocks(*SI, R);
 
   return Changed;
 }
@@ -272,12 +272,10 @@
 
   // Find all trivially dead instructions.
   for (Region::const_block_iterator SI = R->block_begin(), SE = R->block_end();
-      SI != SE; ++SI) {
-    BasicBlock *BB = (*SI)->getNodeAs<BasicBlock>();
-    for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I)
+      SI != SE; ++SI)
+    for (BasicBlock::iterator I = (*SI)->begin(), E = (*SI)->end(); I != E; ++I)
       if (isInstructionTriviallyDead(I))
         WorkList.push_back(I);
-  }
 
   if (WorkList.empty()) return false;
 
@@ -349,7 +347,7 @@
 
   for (Region::const_block_iterator SI = R->block_begin(), SE = R->block_end();
        SI != SE; ++SI)
-    Changed |= translateScalarToArray((*SI)->getNodeAs<BasicBlock>(), R);
+    Changed |= translateScalarToArray(*SI, R);
 
   return Changed;
 }
@@ -473,7 +471,7 @@
 bool IndependentBlocks::areAllBlocksIndependent(const Region *R) const {
   for (Region::const_block_iterator SI = R->block_begin(), SE = R->block_end();
        SI != SE; ++SI)
-    if (!isIndependentBlock(R, (*SI)->getNodeAs<BasicBlock>()))
+    if (!isIndependentBlock(R, *SI))
       return false;
 
   return true;