From 39a5d8596c8aa1a85638df242293d425f43602e6 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Fri, 25 Feb 2011 10:33:33 +0000 Subject: [PATCH] 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 --- lib/Transforms/Utils/SimplifyCFG.cpp | 8 +++----- test/Transforms/SimplifyCFG/select-gep.ll | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp index 3968d6e8d3b..c6708857cb5 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(I); - if (!GEP->hasAllConstantIndices() && GEP->getNumIndices() > 1) + case Instruction::GetElementPtr: + // GEPs are cheap if all indices are constant. + if (!cast(I)->hasAllConstantIndices()) return false; break; - } case Instruction::Add: case Instruction::Sub: case Instruction::And: diff --git a/test/Transforms/SimplifyCFG/select-gep.ll b/test/Transforms/SimplifyCFG/select-gep.ll index 98650f08663..009f05e5574 100644 --- a/test/Transforms/SimplifyCFG/select-gep.ll +++ b/test/Transforms/SimplifyCFG/select-gep.ll @@ -15,7 +15,7 @@ if.end: ret i8* %x.addr ; CHECK: @test1 -; CHECK: %x.addr = select i1 %cmp, i8* %incdec.ptr, i8* %x +; CHECK-NOT: select ; CHECK: ret i8* %x.addr }