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 | 267236ade35200fec4bea0985d7523dacfdb457d (patch) | |
| tree | c7a89031eece86ef02dfd4bed732c571dd7ac416 /lib/Transforms/Utils/CloneFunction.cpp | |
| parent | 42fbe9aa06d8a06db353479edb18ff3d4543147c (diff) | |
| download | llvm-267236ade35200fec4bea0985d7523dacfdb457d.tar.gz llvm-267236ade35200fec4bea0985d7523dacfdb457d.tar.bz2 llvm-267236ade35200fec4bea0985d7523dacfdb457d.tar.xz | |
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
Diffstat (limited to 'lib/Transforms/Utils/CloneFunction.cpp')
| -rw-r--r-- | lib/Transforms/Utils/CloneFunction.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/Transforms/Utils/CloneFunction.cpp b/lib/Transforms/Utils/CloneFunction.cpp index 6d6661e825..cf21f1ed97 100644 --- a/lib/Transforms/Utils/CloneFunction.cpp +++ b/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); } |