[llvm-branch-commits] [llvm-branch] r120655 - /llvm/branches/Apple/whitney/lib/Target/ARM/ARMFastISel.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Wed Dec  1 20:51:43 2010
New Revision: 120655

URL: http://llvm.org/viewvc/llvm-project?rev=120655&view=rev
Log:
Merge r119861:
--
Author: Eric Christopher <echristo at apple.com>
Date:   Fri Nov 19 22:37:58 2010 +0000

    Update comment.

Modified:
    llvm/branches/Apple/whitney/lib/Target/ARM/ARMFastISel.cpp

Modified: llvm/branches/Apple/whitney/lib/Target/ARM/ARMFastISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/whitney/lib/Target/ARM/ARMFastISel.cpp?rev=120655&r1=120654&r2=120655&view=diff
==============================================================================
--- llvm/branches/Apple/whitney/lib/Target/ARM/ARMFastISel.cpp (original)
+++ llvm/branches/Apple/whitney/lib/Target/ARM/ARMFastISel.cpp Wed Dec  1 20:51:43 2010
@@ -608,9 +608,8 @@
   const User *U = NULL;
   unsigned Opcode = Instruction::UserOp1;
   if (const Instruction *I = dyn_cast<Instruction>(Obj)) {
-    // 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.
+    // Don't walk into other basic blocks unless the object is an alloca from
+    // another block, otherwise it may not have a virtual register assigned.
     if (FuncInfo.MBBMap[I->getParent()] != FuncInfo.MBB)
       return false;
     Opcode = I->getOpcode();