diff options
| author | Nick Lewycky <nicholas@mxc.ca> | 2011-10-02 09:12:55 +0000 |
|---|---|---|
| committer | Nick Lewycky <nicholas@mxc.ca> | 2011-10-02 09:12:55 +0000 |
| commit | 40a34dd9a3a66b7e05d7616496a7744c615e8f9a (patch) | |
| tree | 9deea55347a57389af24e82682f279d08720eb45 /llvm/lib/Transforms/Utils/CloneFunction.cpp | |
| parent | a884013eaac3092348c3a3b5878d03d226a9b036 (diff) | |
| download | llvm-40a34dd9a3a66b7e05d7616496a7744c615e8f9a.zip llvm-40a34dd9a3a66b7e05d7616496a7744c615e8f9a.tar.gz llvm-40a34dd9a3a66b7e05d7616496a7744c615e8f9a.tar.bz2 | |
Enhance a couple places where we were doing constant folding of instructions,
but not load instructions. Noticed by inspection.
llvm-svn: 140966
Diffstat (limited to 'llvm/lib/Transforms/Utils/CloneFunction.cpp')
| -rw-r--r-- | llvm/lib/Transforms/Utils/CloneFunction.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/llvm/lib/Transforms/Utils/CloneFunction.cpp b/llvm/lib/Transforms/Utils/CloneFunction.cpp index 6d6661e..cf21f1e 100644 --- a/llvm/lib/Transforms/Utils/CloneFunction.cpp +++ b/llvm/lib/Transforms/Utils/CloneFunction.cpp @@ -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); } |