diff options
| author | Eric Christopher <echristo@apple.com> | 2011-06-23 06:24:52 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@apple.com> | 2011-06-23 06:24:52 +0000 |
| commit | 96513120b73821726d0e33f2a64afbe464cd8b74 (patch) | |
| tree | bb51f3ebc9ee79cd1dfc742611d26577244684cc /llvm/lib/Transforms/Utils/BasicBlockUtils.cpp | |
| parent | b0d8199925611f010f87a5c1450d054b4ab9293e (diff) | |
| download | llvm-96513120b73821726d0e33f2a64afbe464cd8b74.zip llvm-96513120b73821726d0e33f2a64afbe464cd8b74.tar.gz llvm-96513120b73821726d0e33f2a64afbe464cd8b74.tar.bz2 | |
Revert r133513:
"Reinstate r133435 and r133449 (reverted in r133499) now that the clang
self-hosted build failure has been fixed (r133512)."
Due to some additional warnings.
llvm-svn: 133700
Diffstat (limited to 'llvm/lib/Transforms/Utils/BasicBlockUtils.cpp')
| -rw-r--r-- | llvm/lib/Transforms/Utils/BasicBlockUtils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp b/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp index b4f74f9..92464e8 100644 --- a/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp +++ b/llvm/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); |