Revert "[LoopUtils] Updated deleteDeadLoop() to handle loop nest."

This reverts commit cd09fee. This reverts commit c066ff1.
llvm · Dec 17, 2019 · ec4749e · ec4749e
1 parent 0bc3336
commit ec4749e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 103 deletions.
diff --git a/llvm/lib/Transforms/Utils/LoopUtils.cpp b/llvm/lib/Transforms/Utils/LoopUtils.cpp
@@ -673,18 +673,7 @@ void llvm::deleteDeadLoop(Loop *L, DominatorTree *DT = nullptr,
       LI->removeBlock(BB);
 
     // The last step is to update LoopInfo now that we've eliminated this loop.
-    // Note: LoopInfo::erase remove the given loop and relink its subloops with
-    // its parent. While removeLoop/removeChildLoop remove the given loop but
-    // not relink its subloops, which is what we want.
-    if (Loop *ParentLoop = L->getParentLoop()) {
-      Loop::iterator I = find(ParentLoop->begin(), ParentLoop->end(), L);
-      assert(I != ParentLoop->end() && "Couldn't find loop");
-      ParentLoop->removeChildLoop(I);
-    } else {
-      Loop::iterator I = find(LI->begin(), LI->end(), L);
-      assert(I != LI->end() && "Couldn't find loop");
-      LI->removeLoop(I);
-    }
+    LI->erase(L);
   }
 }
 

diff --git a/llvm/unittests/Transforms/Utils/CMakeLists.txt b/llvm/unittests/Transforms/Utils/CMakeLists.txt
@@ -15,7 +15,6 @@ add_llvm_unittest(UtilsTests
   FunctionComparatorTest.cpp
   IntegerDivisionTest.cpp
   LocalTest.cpp
-  LoopUtilsTest.cpp
   SizeOptsTest.cpp
   SSAUpdaterBulkTest.cpp
   UnrollLoopTest.cpp

diff --git a/llvm/unittests/Transforms/Utils/LoopUtilsTest.cpp b/llvm/unittests/Transforms/Utils/LoopUtilsTest.cpp