diff options
| -rw-r--r-- | lib/Transforms/Utils/SimplifyCFG.cpp | 8 | ||||
| -rw-r--r-- | 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 3968d6e8d3..c6708857cb 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: diff --git a/test/Transforms/SimplifyCFG/select-gep.ll b/test/Transforms/SimplifyCFG/select-gep.ll index 98650f0866..009f05e557 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 } |