diff options
| author | Dan Gohman <gohman@apple.com> | 2010-11-13 00:31:40 +0000 |
|---|---|---|
| committer | Dan Gohman <gohman@apple.com> | 2010-11-13 00:31:40 +0000 |
| commit | 0e65eb2065fe2ccd08169a56f9f1770a929b8e6e (patch) | |
| tree | f060bd08d9fa7b24956f83b8aacdcc874b1a31cc /lib | |
| parent | 935338bd868aab26a81e627392d0f2578cd3d60e (diff) | |
| download | external_llvm-0e65eb2065fe2ccd08169a56f9f1770a929b8e6e.zip external_llvm-0e65eb2065fe2ccd08169a56f9f1770a929b8e6e.tar.gz external_llvm-0e65eb2065fe2ccd08169a56f9f1770a929b8e6e.tar.bz2 | |
Revert r118917, which is implicated in the llvm-gcc-i386-linux-selfhost failure.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@118954 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Target/X86/X86FastISel.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/Target/X86/X86FastISel.cpp b/lib/Target/X86/X86FastISel.cpp index ee66433..b938539 100644 --- a/lib/Target/X86/X86FastISel.cpp +++ b/lib/Target/X86/X86FastISel.cpp @@ -320,11 +320,11 @@ bool X86FastISel::X86SelectAddress(const Value *V, X86AddressMode &AM) { // 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.StaticAllocaMap.count(static_cast<const AllocaInst *>(V)) || - FuncInfo.MBBMap[I->getParent()] == FuncInfo.MBB) { - Opcode = I->getOpcode(); - U = I; - } + if (FuncInfo.MBBMap[I->getParent()] != FuncInfo.MBB) + return false; + + Opcode = I->getOpcode(); + U = I; } else if (const ConstantExpr *C = dyn_cast<ConstantExpr>(V)) { Opcode = C->getOpcode(); U = C; |