[llvm-branch-commits] [llvm-branch] r85977 - /llvm/branches/Apple/Leela/lib/CodeGen/BranchFolding.cpp

[Bill Wendling]

Author: void
Date: Tue Nov  3 17:48:16 2009
New Revision: 85977

URL: http://llvm.org/viewvc/llvm-project?rev=85977&view=rev
Log:
$ svn merge -c 85975 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r85975 into '.':
U    lib/CodeGen/BranchFolding.cpp


Modified:
    llvm/branches/Apple/Leela/lib/CodeGen/BranchFolding.cpp

Modified: llvm/branches/Apple/Leela/lib/CodeGen/BranchFolding.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/CodeGen/BranchFolding.cpp?rev=85977&r1=85976&r2=85977&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/CodeGen/BranchFolding.cpp (original)
+++ llvm/branches/Apple/Leela/lib/CodeGen/BranchFolding.cpp Tue Nov  3 17:48:16 2009
@@ -1050,7 +1050,8 @@
     // If this branch is the only thing in its block, see if we can forward
     // other blocks across it.
     if (CurTBB && CurCond.empty() && CurFBB == 0 && 
-        MBB->begin()->getDesc().isBranch() && CurTBB != MBB) {
+        MBB->begin()->getDesc().isBranch() && CurTBB != MBB &&
+        !MBB->hasAddressTaken()) {
       // This block may contain just an unconditional branch.  Because there can
       // be 'non-branch terminators' in the block, try removing the branch and
       // then seeing if the block is empty.