From dfc9aa7f4ed0eccd83fbfa602ad65353c83424dd Mon Sep 17 00:00:00 2001 From: David Green Date: Wed, 28 Feb 2018 11:00:08 +0000 Subject: [Dominators] Remove verifyDomTree and add some verifying for Post Dom Trees Removes verifyDomTree, using assert(verify()) everywhere instead, and changes verify a little to always run IsSameAsFreshTree first in order to print good output when we find errors. Also adds verifyAnalysis for PostDomTrees, which will allow checking of PostDomTrees it the same way we check DomTrees and MachineDomTrees. Differential Revision: https://reviews.llvm.org/D41298 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@326315 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/Transforms/Scalar/LoopPassManagerTest.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'unittests/Transforms') diff --git a/unittests/Transforms/Scalar/LoopPassManagerTest.cpp b/unittests/Transforms/Scalar/LoopPassManagerTest.cpp index 2b8130b9e00..57fb57ec66c 100644 --- a/unittests/Transforms/Scalar/LoopPassManagerTest.cpp +++ b/unittests/Transforms/Scalar/LoopPassManagerTest.cpp @@ -962,7 +962,7 @@ TEST_F(LoopPassManagerTest, LoopChildInsertion) { AR.DT.addNewBlock(NewLoop010PHBB, &Loop01BB); AR.DT.addNewBlock(NewLoop010BB, NewLoop010PHBB); AR.DT.addNewBlock(NewLoop01LatchBB, NewLoop010BB); - AR.DT.verifyDomTree(); + EXPECT_TRUE(AR.DT.verify()); L.addBasicBlockToLoop(NewLoop010PHBB, AR.LI); NewLoop->addBasicBlockToLoop(NewLoop010BB, AR.LI); L.addBasicBlockToLoop(NewLoop01LatchBB, AR.LI); @@ -1004,7 +1004,7 @@ TEST_F(LoopPassManagerTest, LoopChildInsertion) { AR.DT.addNewBlock(NewLoop011PHBB, NewLoop010BB); auto *NewDTNode = AR.DT.addNewBlock(NewLoop011BB, NewLoop011PHBB); AR.DT.changeImmediateDominator(AR.DT[NewLoop01LatchBB], NewDTNode); - AR.DT.verifyDomTree(); + EXPECT_TRUE(AR.DT.verify()); L.addBasicBlockToLoop(NewLoop011PHBB, AR.LI); NewLoop->addBasicBlockToLoop(NewLoop011BB, AR.LI); NewLoop->verifyLoop(); @@ -1149,7 +1149,7 @@ TEST_F(LoopPassManagerTest, LoopPeerInsertion) { AR.DT.addNewBlock(NewLoop01PHBB, &Loop00BB); auto *NewDTNode = AR.DT.addNewBlock(NewLoop01BB, NewLoop01PHBB); AR.DT.changeImmediateDominator(AR.DT[&Loop02PHBB], NewDTNode); - AR.DT.verifyDomTree(); + EXPECT_TRUE(AR.DT.verify()); L.getParentLoop()->addBasicBlockToLoop(NewLoop01PHBB, AR.LI); NewLoop->addBasicBlockToLoop(NewLoop01BB, AR.LI); L.getParentLoop()->verifyLoop(); @@ -1216,7 +1216,7 @@ TEST_F(LoopPassManagerTest, LoopPeerInsertion) { AR.DT.addNewBlock(NewLoop040PHBB, NewLoop04BB); AR.DT.addNewBlock(NewLoop040BB, NewLoop040PHBB); AR.DT.addNewBlock(NewLoop04LatchBB, NewLoop040BB); - AR.DT.verifyDomTree(); + EXPECT_TRUE(AR.DT.verify()); L.getParentLoop()->addBasicBlockToLoop(NewLoop03PHBB, AR.LI); NewLoops[0]->addBasicBlockToLoop(NewLoop03BB, AR.LI); L.getParentLoop()->addBasicBlockToLoop(NewLoop04PHBB, AR.LI); @@ -1271,7 +1271,7 @@ TEST_F(LoopPassManagerTest, LoopPeerInsertion) { AR.DT.addNewBlock(NewLoop1PHBB, &Loop0BB); auto *NewDTNode = AR.DT.addNewBlock(NewLoop1BB, NewLoop1PHBB); AR.DT.changeImmediateDominator(AR.DT[&Loop2PHBB], NewDTNode); - AR.DT.verifyDomTree(); + EXPECT_TRUE(AR.DT.verify()); NewLoop->addBasicBlockToLoop(NewLoop1BB, AR.LI); NewLoop->verifyLoop(); Updater.addSiblingLoops({NewLoop}); @@ -1508,7 +1508,7 @@ TEST_F(LoopPassManagerTest, LoopDeletion) { AR.DT.addNewBlock(NewLoop03BB, NewLoop03PHBB); AR.DT.changeImmediateDominator(AR.DT[&Loop0LatchBB], AR.DT[NewLoop03BB]); - AR.DT.verifyDomTree(); + EXPECT_TRUE(AR.DT.verify()); ParentL->addBasicBlockToLoop(NewLoop03PHBB, AR.LI); NewSibling->addBasicBlockToLoop(NewLoop03BB, AR.LI); NewSibling->verifyLoop(); -- cgit v1.2.3