Enhance a couple places where we were doing constant folding of instructions,

but not load instructions. Noticed by inspection.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@140966 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Nick Lewycky 2011-10-02 09:12:55 +00:00
parent 42fbe9aa06
commit 267236ade3
2 changed files with 8 additions and 7 deletions

View File

@ -324,10 +324,15 @@ static Value *SimplifyWithOpReplaced(Value *V, Value *Op, Value *RepOp,
}
// All operands were constants, fold it.
if (ConstOps.size() == I->getNumOperands())
if (ConstOps.size() == I->getNumOperands()) {
if (LoadInst *LI = dyn_cast<LoadInst>(I))
if (!LI->isVolatile())
return ConstantFoldLoadFromConstPtr(ConstOps[0], TD);
return ConstantFoldInstOperands(I->getOpcode(), I->getType(),
ConstOps, TD);
}
}
return 0;
}

View File

@ -331,12 +331,8 @@ ConstantFoldMappedInstruction(const Instruction *I) {
TD);
if (const LoadInst *LI = dyn_cast<LoadInst>(I))
if (ConstantExpr *CE = dyn_cast<ConstantExpr>(Ops[0]))
if (!LI->isVolatile() && CE->getOpcode() == Instruction::GetElementPtr)
if (GlobalVariable *GV = dyn_cast<GlobalVariable>(CE->getOperand(0)))
if (GV->isConstant() && GV->hasDefinitiveInitializer())
return ConstantFoldLoadThroughGEPConstantExpr(GV->getInitializer(),
CE);
if (!LI->isVolatile())
return ConstantFoldLoadFromConstPtr(Ops[0], TD);
return ConstantFoldInstOperands(I->getOpcode(), I->getType(), Ops, TD);
}