diff options
author | Eric Christopher <echristo@apple.com> | 2010-11-15 21:11:06 +0000 |
---|---|---|
committer | Eric Christopher <echristo@apple.com> | 2010-11-15 21:11:06 +0000 |
commit | 76dda7ec1d8d0ee65a103b6710ab75c2a9e012d1 (patch) | |
tree | b1ac08b4d1bcf673a47ab9b941fd627dbe6e01be /lib | |
parent | a284aa1657d08390209b87f57782936e45d562ba (diff) | |
download | external_llvm-76dda7ec1d8d0ee65a103b6710ab75c2a9e012d1.zip external_llvm-76dda7ec1d8d0ee65a103b6710ab75c2a9e012d1.tar.gz external_llvm-76dda7ec1d8d0ee65a103b6710ab75c2a9e012d1.tar.bz2 |
Recommit this change and remove the failing part of the test - it didn't
pass in the first place and was masked by earlier failures not warning
and aborting the block.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@119184 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Target/ARM/ARMFastISel.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/Target/ARM/ARMFastISel.cpp b/lib/Target/ARM/ARMFastISel.cpp index 58f72f6..f0413a3 100644 --- a/lib/Target/ARM/ARMFastISel.cpp +++ b/lib/Target/ARM/ARMFastISel.cpp @@ -590,10 +590,11 @@ bool ARMFastISel::ARMComputeRegOffset(const Value *Obj, unsigned &Base, // 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 *>(Obj)) || + FuncInfo.MBBMap[I->getParent()] == FuncInfo.MBB) { + Opcode = I->getOpcode(); + U = I; + } } else if (const ConstantExpr *C = dyn_cast<ConstantExpr>(Obj)) { Opcode = C->getOpcode(); U = C; |