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.
llvm-svn: 126481
diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
index 3968d6e..c670885 100644
--- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
+++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
@@ -247,13 +247,11 @@
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: