[llvm-branch-commits] [llvm-branch] r119413 - /llvm/branches/Apple/whitney/lib/Target/X86/X86FastISel.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Tue Nov 16 18:23:17 2010
New Revision: 119413

URL: http://llvm.org/viewvc/llvm-project?rev=119413&view=rev
Log:
Merge r119400:
--
Author: Dan Gohman <gohman at apple.com>
Date:   Tue Nov 16 22:43:23 2010 +0000

    Reapply r118917. With pseudo-instruction expansion moved to
    a different pass, the complicated interaction between cmov expansion
    and fast isel is no longer a concern.

Modified:
    llvm/branches/Apple/whitney/lib/Target/X86/X86FastISel.cpp

Modified: llvm/branches/Apple/whitney/lib/Target/X86/X86FastISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/whitney/lib/Target/X86/X86FastISel.cpp?rev=119413&r1=119412&r2=119413&view=diff
==============================================================================
--- llvm/branches/Apple/whitney/lib/Target/X86/X86FastISel.cpp (original)
+++ llvm/branches/Apple/whitney/lib/Target/X86/X86FastISel.cpp Tue Nov 16 18:23:17 2010
@@ -361,11 +361,11 @@
     // Don't walk into other basic blocks; it's possible we haven't
     // visited them yet, so the instructions may not yet be assigned
     // virtual registers.
-    if (FuncInfo.MBBMap[I->getParent()] != FuncInfo.MBB)
-      return false;
-
-    Opcode = I->getOpcode();
-    U = I;
+    if (FuncInfo.StaticAllocaMap.count(static_cast<const AllocaInst *>(V)) ||
+        FuncInfo.MBBMap[I->getParent()] == FuncInfo.MBB) {
+      Opcode = I->getOpcode();
+      U = I;
+    }
   } else if (const ConstantExpr *C = dyn_cast<ConstantExpr>(V)) {
     Opcode = C->getOpcode();
     U = C;