From abd1d859b3c35957a3dd5965cf1fd420df0d20e3 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Thu, 1 Jul 2010 02:58:21 +0000 Subject: [PATCH] Fix X86FastISel's add folding to actually work, and not fall back to SelectionDAG. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@107376 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/X86/X86FastISel.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/Target/X86/X86FastISel.cpp b/lib/Target/X86/X86FastISel.cpp index f371796141d..1c700b290a6 100644 --- a/lib/Target/X86/X86FastISel.cpp +++ b/lib/Target/X86/X86FastISel.cpp @@ -430,6 +430,14 @@ bool X86FastISel::X86SelectAddress(const Value *V, X86AddressMode &AM) { if (const ConstantInt *CI = dyn_cast(Op)) { // Constant-offset addressing. Disp += CI->getSExtValue() * S; + } else if (isa(Op) && + isa(cast(Op)->getOperand(1))) { + // An add with a constant operand. Fold the constant. + ConstantInt *CI = + cast(cast(Op)->getOperand(1)); + Disp += CI->getSExtValue() * S; + // Add the other operand back to the work list. + Worklist.push_back(cast(Op)->getOperand(0)); } else if (IndexReg == 0 && (!AM.GV || !Subtarget->isPICStyleRIPRel()) && (S == 1 || S == 2 || S == 4 || S == 8)) { @@ -438,10 +446,6 @@ bool X86FastISel::X86SelectAddress(const Value *V, X86AddressMode &AM) { IndexReg = getRegForGEPIndex(Op).first; if (IndexReg == 0) return false; - } else if (const AddOperator *Add = dyn_cast(Op)) { - // An add. Try to fold both operands. - Worklist.push_back(Add->getOperand(0)); - Worklist.push_back(Add->getOperand(1)); } else // Unsupported. goto unsupported_gep; -- 2.34.1