diff --git a/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp b/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp --- a/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp +++ b/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp @@ -184,6 +184,17 @@ continue; } + if (match(Br->getCondition(), m_And(m_Cmp(), m_Cmp()))) { + if (Br->getSuccessor(0)->getSinglePredecessor()) { + auto *OrI = cast(Br->getCondition()); + WorkList.emplace_back(DT.getNode(Br->getSuccessor(0)), + cast(OrI->getOperand(0)), false); + WorkList.emplace_back(DT.getNode(Br->getSuccessor(0)), + cast(OrI->getOperand(1)), false); + } + continue; + } + auto *CmpI = dyn_cast(Br->getCondition()); if (!CmpI) continue; diff --git a/llvm/test/Transforms/ConstraintElimination/and.ll b/llvm/test/Transforms/ConstraintElimination/and.ll --- a/llvm/test/Transforms/ConstraintElimination/and.ll +++ b/llvm/test/Transforms/ConstraintElimination/and.ll @@ -12,11 +12,11 @@ ; CHECK-NEXT: br i1 [[AND]], label [[BB1:%.*]], label [[EXIT:%.*]] ; CHECK: bb1: ; CHECK-NEXT: [[T_1:%.*]] = icmp ule i32 [[X]], [[Z]] -; CHECK-NEXT: call void @use(i1 [[T_1]]) +; CHECK-NEXT: call void @use(i1 true) ; CHECK-NEXT: [[T_2:%.*]] = icmp ule i32 [[X]], [[Y]] -; CHECK-NEXT: call void @use(i1 [[T_2]]) +; CHECK-NEXT: call void @use(i1 true) ; CHECK-NEXT: [[T_3:%.*]] = icmp ule i32 [[Y]], [[Z]] -; CHECK-NEXT: call void @use(i1 [[T_3]]) +; CHECK-NEXT: call void @use(i1 true) ; CHECK-NEXT: [[C_3:%.*]] = icmp ule i32 [[X]], [[A:%.*]] ; CHECK-NEXT: call void @use(i1 [[C_3]]) ; CHECK-NEXT: ret i32 10