aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2011-02-25 10:33:33 +0000
committerBenjamin Kramer <benny.kra@googlemail.com>2011-02-25 10:33:33 +0000
commit278be783b5068e6f87f16bc9b69a77e0bc958f9f (patch)
tree39bfc444aed2334406e7d257a41c398020557595 /lib
parent49ff8a76d02f1c5f8da7cd2675be191c7be109c4 (diff)
downloadexternal_llvm-278be783b5068e6f87f16bc9b69a77e0bc958f9f.zip
external_llvm-278be783b5068e6f87f16bc9b69a77e0bc958f9f.tar.gz
external_llvm-278be783b5068e6f87f16bc9b69a77e0bc958f9f.tar.bz2
Revert "SimplifyCFG: GEPs with just one non-constant index are also cheap."
Yes, there are other types than i8* and GEPs on them can produce an add+multiply. We don't consider that cheap enough to be speculatively executed. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@126481 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/Transforms/Utils/SimplifyCFG.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp
index 3968d6e..c670885 100644
--- a/lib/Transforms/Utils/SimplifyCFG.cpp
+++ b/lib/Transforms/Utils/SimplifyCFG.cpp
@@ -247,13 +247,11 @@ static bool DominatesMergePoint(Value *V, BasicBlock *BB,
if (PBB->getFirstNonPHIOrDbg() != I)
return false;
break;
- case Instruction::GetElementPtr: {
- // GEPs are cheap if all indices are constant or if there's only one index.
- GetElementPtrInst *GEP = cast<GetElementPtrInst>(I);
- if (!GEP->hasAllConstantIndices() && GEP->getNumIndices() > 1)
+ case Instruction::GetElementPtr:
+ // GEPs are cheap if all indices are constant.
+ if (!cast<GetElementPtrInst>(I)->hasAllConstantIndices())
return false;
break;
- }
case Instruction::Add:
case Instruction::Sub:
case Instruction::And: