diff options
| author | Jay Foad <jay.foad@gmail.com> | 2011-06-21 10:33:19 +0000 |
|---|---|---|
| committer | Jay Foad <jay.foad@gmail.com> | 2011-06-21 10:33:19 +0000 |
| commit | cd35e09a4a3c640b9da0b1dfe3548a605c929ae5 (patch) | |
| tree | e30d6c21f872a780cbcf44458e2b70489803eb20 /lib/Transforms/Utils/BasicBlockUtils.cpp | |
| parent | 69254f67a54656ebf88fe854d0e8bf7fc58abda6 (diff) | |
| download | llvm-cd35e09a4a3c640b9da0b1dfe3548a605c929ae5.tar.gz llvm-cd35e09a4a3c640b9da0b1dfe3548a605c929ae5.tar.bz2 llvm-cd35e09a4a3c640b9da0b1dfe3548a605c929ae5.tar.xz | |
Reinstate r133435 and r133449 (reverted in r133499) now that the clang
self-hosted build failure has been fixed (r133512).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@133513 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 92464e8cf1..b4f74f97e9 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); |