diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2009-05-21 20:40:30 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2009-05-21 20:40:30 +0000 |
| commit | 0f4012ca9d0e7a6dba7862201d8267681c0e43b0 (patch) | |
| tree | c89b46c77830e9dccb5055c4df3f989f6109c8cc | |
| parent | c4c268b04fec5e4c2a0ad4e9aa5b2192456624eb (diff) | |
| download | llvm-0f4012ca9d0e7a6dba7862201d8267681c0e43b0.tar.gz llvm-0f4012ca9d0e7a6dba7862201d8267681c0e43b0.tar.bz2 llvm-0f4012ca9d0e7a6dba7862201d8267681c0e43b0.tar.xz | |
Fix some incorrect logic in DominanceFrontier::splitBlock. Part of
PR4238.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@72223 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/VMCore/Dominators.cpp | 8 | ||||
| -rw-r--r-- | test/Transforms/LoopSimplify/2004-04-13-LoopSimplifyUpdateDomFrontier.ll | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/lib/VMCore/Dominators.cpp b/lib/VMCore/Dominators.cpp index 6f1de46604..735a70c509 100644 --- a/lib/VMCore/Dominators.cpp +++ b/lib/VMCore/Dominators.cpp @@ -160,10 +160,7 @@ void DominanceFrontier::splitBlock(BasicBlock *NewBB) { break; } } - - if (!BlockDominatesAny) - continue; - + // If NewBBSucc should not stay in our dominator frontier, remove it. // We remove it unless there is a predecessor of NewBBSucc that we // dominate, but we don't strictly dominate NewBBSucc. @@ -181,7 +178,8 @@ void DominanceFrontier::splitBlock(BasicBlock *NewBB) { if (ShouldRemove) removeFromFrontier(DFI, NewBBSucc); - addToFrontier(DFI, NewBB); + if (BlockDominatesAny && (&*FI == NewBB || !DT.dominates(FI, NewBB))) + addToFrontier(DFI, NewBB); } } diff --git a/test/Transforms/LoopSimplify/2004-04-13-LoopSimplifyUpdateDomFrontier.ll b/test/Transforms/LoopSimplify/2004-04-13-LoopSimplifyUpdateDomFrontier.ll index 427631c07f..bd0515c476 100644 --- a/test/Transforms/LoopSimplify/2004-04-13-LoopSimplifyUpdateDomFrontier.ll +++ b/test/Transforms/LoopSimplify/2004-04-13-LoopSimplifyUpdateDomFrontier.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | opt -scalarrepl -loopsimplify -licm -disable-output +; RUN: llvm-as < %s | opt -scalarrepl -loopsimplify -licm -disable-output -verify-dom-info define void @inflate() { entry: |