[polly] r326656 - Revert "[Acc] Fix for PR33208"

[Philip Pfaffe via llvm-commits]

Author: pfaffe
Date: Sat Mar  3 07:34:49 2018
New Revision: 326656

URL: http://llvm.org/viewvc/llvm-project?rev=326656&view=rev
Log:
Revert "[Acc] Fix for PR33208"

This reverts commit r326643. Fix didn't really fix anything.

Modified:
    polly/trunk/lib/CodeGen/PPCGCodeGeneration.cpp

Modified: polly/trunk/lib/CodeGen/PPCGCodeGeneration.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/PPCGCodeGeneration.cpp?rev=326656&r1=326655&r2=326656&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/PPCGCodeGeneration.cpp (original)
+++ polly/trunk/lib/CodeGen/PPCGCodeGeneration.cpp Sat Mar  3 07:34:49 2018
@@ -1555,16 +1555,20 @@ void GPUNodeBuilder::clearDominators(Fun
 }
 
 void GPUNodeBuilder::clearScalarEvolution(Function *F) {
-  for (auto *L : LI)
+  for (BasicBlock &BB : *F) {
+    Loop *L = LI.getLoopFor(&BB);
     if (L)
       SE.forgetLoop(L);
+  }
 }
 
 void GPUNodeBuilder::clearLoops(Function *F) {
-  clearScalarEvolution(F);
-  SmallVector<Loop *, 1> Loops(LI.begin(), LI.end());
-  for (auto *L : Loops)
-    LI.erase(L);
+  for (BasicBlock &BB : *F) {
+    Loop *L = LI.getLoopFor(&BB);
+    if (L)
+      SE.forgetLoop(L);
+    LI.removeBlock(&BB);
+  }
 }
 
 std::tuple<Value *, Value *> GPUNodeBuilder::getGridSizes(ppcg_kernel *Kernel) {