diff options
| author | Dan Gohman <gohman@apple.com> | 2010-06-18 20:44:47 +0000 |
|---|---|---|
| committer | Dan Gohman <gohman@apple.com> | 2010-06-18 20:44:47 +0000 |
| commit | ea9f151cbc1ce153c7605a02acc31f76cbb3c5a2 (patch) | |
| tree | 9a276ae809c1e5cc81fe03b3eab512b5f91b9d47 | |
| parent | 10416803c1370fe1e52a7f1c431fe506be9c1ef5 (diff) | |
Fix X86FastISel's address-mode folding to stay within the
original basic block. This avoids trouble with examining
instructions in other basic blocks which haven't been
assigned registers yet.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@106310 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/X86/X86FastISel.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/Target/X86/X86FastISel.cpp b/lib/Target/X86/X86FastISel.cpp index 7bbe6ab575..cbdfd64842 100644 --- a/lib/Target/X86/X86FastISel.cpp +++ b/lib/Target/X86/X86FastISel.cpp @@ -342,6 +342,12 @@ bool X86FastISel::X86SelectAddress(const Value *V, X86AddressMode &AM) { const User *U = NULL; unsigned Opcode = Instruction::UserOp1; if (const Instruction *I = dyn_cast<Instruction>(V)) { + // 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 (MBBMap[I->getParent()] != MBB) + return false; + Opcode = I->getOpcode(); U = I; } else if (const ConstantExpr *C = dyn_cast<ConstantExpr>(V)) { |