Index: llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
===================================================================
--- llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
+++ llvm/lib/Transforms/InstCombine/InstCombineMulDivRem.cpp
@@ -1786,6 +1786,18 @@
     return SelectInst::Create(Cmp, ConstantInt::getNullValue(Ty), Op0);
   }
 
+  // If X / Y == 0, then (X + 1) % Y => (X + 1 == Y) ? 0 : X + 1 .
+  if (match(Op0, m_Add(m_Value(X), m_One()))) {
+    Value *Val =
+        simplifyICmpInst(ICmpInst::ICMP_ULT, X, Op1, SQ.getWithInstruction(&I));
+    if (auto *CVal = dyn_cast_or_null<Constant>(Val))
+      if (CVal->isOneValue()) {
+        Value *FrozenX = Builder.CreateFreeze(Op0, Op0->getName() + ".frozen");
+        Value *Cmp = Builder.CreateICmpEQ(FrozenX, Op1);
+        return SelectInst::Create(Cmp, ConstantInt::getNullValue(Ty), FrozenX);
+      }
+  }
+
   return nullptr;
 }
 
Index: llvm/test/Transforms/InstCombine/urem-via-cmp-select.ll
===================================================================
--- /dev/null
+++ llvm/test/Transforms/InstCombine/urem-via-cmp-select.ll
@@ -0,0 +1,77 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
+; RUN: opt < %s -passes=instcombine -S | FileCheck %s
+
+; https://alive2.llvm.org/ce/z/UNmz9j
+define noundef i64 @urem_assume(i64 noundef %x, i64 noundef %n) {
+; CHECK-LABEL: @urem_assume(
+; CHECK-NEXT:  start:
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ult i64 [[X:%.*]], [[N:%.*]]
+; CHECK-NEXT:    tail call void @llvm.assume(i1 [[CMP]])
+; CHECK-NEXT:    [[ADD:%.*]] = add i64 [[X]], 1
+; CHECK-NEXT:    [[TMP0:%.*]] = icmp eq i64 [[ADD]], [[N]]
+; CHECK-NEXT:    [[OUT:%.*]] = select i1 [[TMP0]], i64 0, i64 [[ADD]]
+; CHECK-NEXT:    ret i64 [[OUT]]
+;
+start:
+  %cmp = icmp ult i64 %x, %n
+  tail call void @llvm.assume(i1 %cmp)
+  %add = add nuw i64 %x, 1
+  %out = urem i64 %add, %n
+  ret i64 %out
+}
+
+; https://alive2.llvm.org/ce/z/uo7HMz
+define noundef i64 @urem_assume_without_nuw(i64 noundef %x, i64 noundef %n) {
+; CHECK-LABEL: @urem_assume_without_nuw(
+; CHECK-NEXT:  start:
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ult i64 [[X:%.*]], [[N:%.*]]
+; CHECK-NEXT:    tail call void @llvm.assume(i1 [[CMP]])
+; CHECK-NEXT:    [[ADD:%.*]] = add i64 [[X]], 1
+; CHECK-NEXT:    [[TMP0:%.*]] = icmp eq i64 [[ADD]], [[N]]
+; CHECK-NEXT:    [[OUT:%.*]] = select i1 [[TMP0]], i64 0, i64 [[ADD]]
+; CHECK-NEXT:    ret i64 [[OUT]]
+;
+start:
+  %cmp = icmp ult i64 %x, %n
+  tail call void @llvm.assume(i1 %cmp)
+  %add = add i64 %x, 1
+  %out = urem i64 %add, %n
+  ret i64 %out
+}
+
+define noundef i64 @urem_assume_eq(i64 noundef %x, i64 noundef %n) {
+; CHECK-LABEL: @urem_assume_eq(
+; CHECK-NEXT:  start:
+; CHECK-NEXT:    [[CMP:%.*]] = icmp eq i64 [[X:%.*]], [[N:%.*]]
+; CHECK-NEXT:    tail call void @llvm.assume(i1 [[CMP]])
+; CHECK-NEXT:    [[ADD:%.*]] = add i64 [[X]], 1
+; CHECK-NEXT:    [[OUT:%.*]] = urem i64 [[ADD]], [[N]]
+; CHECK-NEXT:    ret i64 [[OUT]]
+;
+start:
+  %cmp = icmp eq i64 %x, %n
+  tail call void @llvm.assume(i1 %cmp)
+  %add = add i64 %x, 1
+  %out = urem i64 %add, %n
+  ret i64 %out
+}
+
+; Negative test: The assume is false
+define noundef i64 @urem_assume_ne(i64 noundef %x, i64 noundef %n) {
+; CHECK-LABEL: @urem_assume_ne(
+; CHECK-NEXT:  start:
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ne i64 [[X:%.*]], [[N:%.*]]
+; CHECK-NEXT:    tail call void @llvm.assume(i1 [[CMP]])
+; CHECK-NEXT:    [[ADD:%.*]] = add i64 [[X]], 1
+; CHECK-NEXT:    [[OUT:%.*]] = urem i64 [[ADD]], [[N]]
+; CHECK-NEXT:    ret i64 [[OUT]]
+;
+start:
+  %cmp = icmp ne i64 %x, %n
+  tail call void @llvm.assume(i1 %cmp)
+  %add = add i64 %x, 1
+  %out = urem i64 %add, %n
+  ret i64 %out
+}
+
+declare void @llvm.assume(i1 noundef)