diff options
| author | David Green <david.green@arm.com> | 2018-09-25 10:08:47 +0000 | 
|---|---|---|
| committer | David Green <david.green@arm.com> | 2018-09-25 10:08:47 +0000 | 
| commit | 9108c2b92155decd107489f2069907b44f234250 (patch) | |
| tree | 7d031061b1680b4927cacc21b07c859887c62c37 /llvm/lib | |
| parent | 029aa8ec7f52a6dabd3ac3b15e488ebe0148ae2c (diff) | |
| download | bcm5719-llvm-9108c2b92155decd107489f2069907b44f234250.tar.gz bcm5719-llvm-9108c2b92155decd107489f2069907b44f234250.zip  | |
[LoopUnroll] Add check to Latch's terminator in UnrollRuntimeLoopRemainder
In this patch, I'm adding an extra check to the Latch's terminator in llvm::UnrollRuntimeLoopRemainder,
similar to how it is already done in the llvm::UnrollLoop.
The compiler would crash if this function is called with a malformed loop.
Patch by Rodrigo Caetano Rocha!
Differential Revision: https://reviews.llvm.org/D51486
llvm-svn: 342958
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Transforms/Utils/LoopUnrollRuntime.cpp | 24 | 
1 files changed, 19 insertions, 5 deletions
diff --git a/llvm/lib/Transforms/Utils/LoopUnrollRuntime.cpp b/llvm/lib/Transforms/Utils/LoopUnrollRuntime.cpp index ce078ab8f7b..3361883acd0 100644 --- a/llvm/lib/Transforms/Utils/LoopUnrollRuntime.cpp +++ b/llvm/lib/Transforms/Utils/LoopUnrollRuntime.cpp @@ -545,13 +545,27 @@ bool llvm::UnrollRuntimeLoopRemainder(Loop *L, unsigned Count,    BasicBlock *Header = L->getHeader();    BranchInst *LatchBR = cast<BranchInst>(Latch->getTerminator()); + +  if (!LatchBR || LatchBR->isUnconditional()) { +    // The loop-rotate pass can be helpful to avoid this in many cases. +    LLVM_DEBUG( +        dbgs() +        << "Loop latch not terminated by a conditional branch.\n"); +    return false; +  } +    unsigned ExitIndex = LatchBR->getSuccessor(0) == Header ? 1 : 0;    BasicBlock *LatchExit = LatchBR->getSuccessor(ExitIndex); -  // Cloning the loop basic blocks (`CloneLoopBlocks`) requires that one of the -  // targets of the Latch be an exit block out of the loop. This needs -  // to be guaranteed by the callers of UnrollRuntimeLoopRemainder. -  assert(!L->contains(LatchExit) && -         "one of the loop latch successors should be the exit block!"); + +  if (L->contains(LatchExit)) { +    // Cloning the loop basic blocks (`CloneLoopBlocks`) requires that one of the +    // targets of the Latch be an exit block out of the loop. +    LLVM_DEBUG( +        dbgs() +        << "One of the loop latch successors must be the exit block.\n"); +    return false; +  } +    // These are exit blocks other than the target of the latch exiting block.    SmallVector<BasicBlock *, 4> OtherExits;    bool isMultiExitUnrollingEnabled =  | 

