diff options
author | David Majnemer <david.majnemer@gmail.com> | 2015-08-04 08:21:40 +0000 |
---|---|---|
committer | David Majnemer <david.majnemer@gmail.com> | 2015-08-04 08:21:40 +0000 |
commit | eb518bd5d8f01ba6334a23e356488dc068bd1b7f (patch) | |
tree | 82596f8b2e96fae8c72f8061125207644c74249b /llvm/lib/Transforms/Utils/LoopSimplify.cpp | |
parent | 48977c3364d978b234734e6125adf39e55e9603d (diff) | |
download | llvm-eb518bd5d8f01ba6334a23e356488dc068bd1b7f.zip llvm-eb518bd5d8f01ba6334a23e356488dc068bd1b7f.tar.gz llvm-eb518bd5d8f01ba6334a23e356488dc068bd1b7f.tar.bz2 |
Drive-by fixes for LandingPad -> EHPad
This change was done as an audit and is by inspection. The new EH
system is still very much a work in progress. NFC for the landingpad
case.
llvm-svn: 243965
Diffstat (limited to 'llvm/lib/Transforms/Utils/LoopSimplify.cpp')
-rw-r--r-- | llvm/lib/Transforms/Utils/LoopSimplify.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/llvm/lib/Transforms/Utils/LoopSimplify.cpp b/llvm/lib/Transforms/Utils/LoopSimplify.cpp index 1298011e..ca188f4 100644 --- a/llvm/lib/Transforms/Utils/LoopSimplify.cpp +++ b/llvm/lib/Transforms/Utils/LoopSimplify.cpp @@ -261,9 +261,7 @@ static Loop *separateNestedLoop(Loop *L, BasicBlock *Preheader, // The header is not a landing pad; preheader insertion should ensure this. BasicBlock *Header = L->getHeader(); - assert(!Header->isLandingPad() && "Can't insert backedge to landing pad"); - if (!Header->canSplitPredecessors()) - return nullptr; + assert(!Header->isEHPad() && "Can't insert backedge to EH pad"); PHINode *PN = findPHIToPartitionLoops(L, DT, AC); if (!PN) return nullptr; // No known way to partition. @@ -370,8 +368,8 @@ static BasicBlock *insertUniqueBackedgeBlock(Loop *L, BasicBlock *Preheader, if (!Preheader) return nullptr; - // The header is not a landing pad; preheader insertion should ensure this. - assert(!Header->isLandingPad() && "Can't insert backedge to landing pad"); + // The header is not an EH pad; preheader insertion should ensure this. + assert(!Header->isEHPad() && "Can't insert backedge to EH pad"); // Figure out which basic blocks contain back-edges to the loop header. std::vector<BasicBlock*> BackedgeBlocks; |