diff options
| author | Jay Foad <jay.foad@gmail.com> | 2011-06-23 09:09:15 +0000 |
|---|---|---|
| committer | Jay Foad <jay.foad@gmail.com> | 2011-06-23 09:09:15 +0000 |
| commit | 95c3e48f9557adb6064d580684bb14cacec2f826 (patch) | |
| tree | 377049dc513cb4332763e8da894cc3e7aa7ec72e /lib/Transforms/Utils/BasicBlockUtils.cpp | |
| parent | 5b46e8e6b82226810d0d6440b7b5fb05e68df5e8 (diff) | |
| download | external_llvm-95c3e48f9557adb6064d580684bb14cacec2f826.zip external_llvm-95c3e48f9557adb6064d580684bb14cacec2f826.tar.gz external_llvm-95c3e48f9557adb6064d580684bb14cacec2f826.tar.bz2 | |
Reinstate r133513 (reverted in r133700) with an additional fix for a
-Wshorten-64-to-32 warning in Instructions.h.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@133708 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms/Utils/BasicBlockUtils.cpp')
| -rw-r--r-- | lib/Transforms/Utils/BasicBlockUtils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Transforms/Utils/BasicBlockUtils.cpp b/lib/Transforms/Utils/BasicBlockUtils.cpp index 92464e8..b4f74f9 100644 --- a/lib/Transforms/Utils/BasicBlockUtils.cpp +++ b/lib/Transforms/Utils/BasicBlockUtils.cpp @@ -153,13 +153,13 @@ bool llvm::MergeBlockIntoPredecessor(BasicBlock *BB, Pass *P) { // Delete the unconditional branch from the predecessor... PredBB->getInstList().pop_back(); - // Move all definitions in the successor to the predecessor... - PredBB->getInstList().splice(PredBB->end(), BB->getInstList()); - // Make all PHI nodes that referred to BB now refer to Pred as their // source... BB->replaceAllUsesWith(PredBB); + // Move all definitions in the successor to the predecessor... + PredBB->getInstList().splice(PredBB->end(), BB->getInstList()); + // Inherit predecessors name if it exists. if (!PredBB->hasName()) PredBB->takeName(BB); |