diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2013-11-17 18:05:34 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2013-11-17 18:05:34 +0000 |
| commit | f9c8339a4e2735879cce166df60f478e3263119b (patch) | |
| tree | 70f4d1db4b6b179519bb9932b66466f99778b531 /llvm/lib/Transforms/Utils/LoopUnroll.cpp | |
| parent | b90f560303bdec86ce707faec8154212a4134cd8 (diff) | |
| download | bcm5719-llvm-f9c8339a4e2735879cce166df60f478e3263119b.tar.gz bcm5719-llvm-f9c8339a4e2735879cce166df60f478e3263119b.zip | |
Utils/LoopUnroll.cpp: Tweak (StringRef)OldName to be valid until it is used, since r194601.
eraseFromParent() invalidates OldName.
llvm-svn: 194970
Diffstat (limited to 'llvm/lib/Transforms/Utils/LoopUnroll.cpp')
| -rw-r--r-- | llvm/lib/Transforms/Utils/LoopUnroll.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/Utils/LoopUnroll.cpp b/llvm/lib/Transforms/Utils/LoopUnroll.cpp index 9955bfd6264..162807d03c6 100644 --- a/llvm/lib/Transforms/Utils/LoopUnroll.cpp +++ b/llvm/lib/Transforms/Utils/LoopUnroll.cpp @@ -90,6 +90,7 @@ static BasicBlock *FoldBlockIntoPredecessor(BasicBlock *BB, LoopInfo* LI, // Move all definitions in the successor to the predecessor... OnlyPred->getInstList().splice(OnlyPred->end(), BB->getInstList()); + // OldName will be valid until erased. StringRef OldName = BB->getName(); // Erase basic block from the function... @@ -102,12 +103,13 @@ static BasicBlock *FoldBlockIntoPredecessor(BasicBlock *BB, LoopInfo* LI, } } LI->removeBlock(BB); - BB->eraseFromParent(); // Inherit predecessor's name if it exists... if (!OldName.empty() && !OnlyPred->hasName()) OnlyPred->setName(OldName); + BB->eraseFromParent(); + return OnlyPred; } |
