diff --git a/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp b/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp
--- a/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp
@@ -715,6 +715,35 @@
   return nullptr;
 }
 
+//   select (x == 0), 0, x * y --> x * freeze(y)
+//   select (y == 0), 0, x * y --> freeze(x) * y
+// Usage of mul instead of 0 will make the result more poisonous,
+// so the operand that was not checked in the condition should be frozen.
+static Instruction *foldSelectZeroOrMul(SelectInst &SI,
+                                        InstCombiner::BuilderTy &Builder) {
+  auto *CondVal = SI.getCondition();
+  auto *TrueVal = SI.getTrueValue();
+  auto *FalseVal = SI.getFalseValue();
+  Value *CmpLHS;
+  ICmpInst::Predicate Predicate;
+  if (CondVal->getType()->isVectorTy() ||
+      !match(CondVal, m_c_ICmp(Predicate, m_Value(CmpLHS), m_Zero())) ||
+      (Predicate != ICmpInst::ICMP_EQ && Predicate != ICmpInst::ICMP_NE))
+    return nullptr;
+
+  if (Predicate == ICmpInst::ICMP_NE)
+    std::swap(TrueVal, FalseVal);
+
+  Value *X, *Y;
+  if (!match(TrueVal, m_Zero()) ||
+      !match(FalseVal, m_Mul(m_Value(X), m_Value(Y))))
+    return nullptr;
+
+  if (X == CmpLHS)
+    return BinaryOperator::CreateMul(X, Builder.CreateFreeze(Y));
+  return BinaryOperator::CreateMul(Builder.CreateFreeze(X), Y);
+}
+
 /// Transform patterns such as (a > b) ? a - b : 0 into usub.sat(a, b).
 /// There are 8 commuted/swapped variants of this pattern.
 /// TODO: Also support a - UMIN(a,b) patterns.
@@ -2917,6 +2946,8 @@
     return Add;
   if (Instruction *Or = foldSetClearBits(SI, Builder))
     return Or;
+  if (Instruction *Mul = foldSelectZeroOrMul(SI, Builder))
+    return Mul;
 
   // Turn (select C, (op X, Y), (op X, Z)) -> (op X, (select C, Y, Z))
   auto *TI = dyn_cast<Instruction>(TrueVal);
diff --git a/llvm/test/Transforms/InstCombine/select.ll b/llvm/test/Transforms/InstCombine/select.ll
--- a/llvm/test/Transforms/InstCombine/select.ll
+++ b/llvm/test/Transforms/InstCombine/select.ll
@@ -2847,3 +2847,51 @@
 declare void @use(i1)
 declare void @use_i8(i8)
 declare i32 @llvm.cttz.i32(i32, i1 immarg)
+
+define i32 @mul_by_zero(i32 %x, i32 %y) {
+; CHECK-LABEL: @mul_by_zero(
+; CHECK-NEXT:    [[TMP1:%.*]] = freeze i32 [[Y:%.*]]
+; CHECK-NEXT:    [[R:%.*]] = mul i32 [[TMP1]], [[X:%.*]]
+; CHECK-NEXT:    ret i32 [[R]]
+;
+  %c = icmp eq i32 %x, 0
+  %m = mul i32 %x, %y
+  %r = select i1 %c, i32 0, i32 %m
+  ret i32 %r
+}
+
+define i32 @mul_by_zero1(i32 %x, i32 %y) {
+; CHECK-LABEL: @mul_by_zero1(
+; CHECK-NEXT:    [[TMP1:%.*]] = freeze i32 [[X:%.*]]
+; CHECK-NEXT:    [[R:%.*]] = mul i32 [[TMP1]], [[Y:%.*]]
+; CHECK-NEXT:    ret i32 [[R]]
+;
+  %c = icmp eq i32 %y, 0
+  %m = mul i32 %x, %y
+  %r = select i1 %c, i32 0, i32 %m
+  ret i32 %r
+}
+
+define i32 @mul_by_zero2(i32 %x, i32 %y) {
+; CHECK-LABEL: @mul_by_zero2(
+; CHECK-NEXT:    [[TMP1:%.*]] = freeze i32 [[Y:%.*]]
+; CHECK-NEXT:    [[R:%.*]] = mul i32 [[TMP1]], [[X:%.*]]
+; CHECK-NEXT:    ret i32 [[R]]
+;
+  %c = icmp eq i32 0, %x
+  %m = mul i32 %x, %y
+  %r = select i1 %c, i32 0, i32 %m
+  ret i32 %r
+}
+
+define i32 @mul_by_zero3(i32 %x, i32 %y) {
+; CHECK-LABEL: @mul_by_zero3(
+; CHECK-NEXT:    [[TMP1:%.*]] = freeze i32 [[Y:%.*]]
+; CHECK-NEXT:    [[R:%.*]] = mul i32 [[TMP1]], [[X:%.*]]
+; CHECK-NEXT:    ret i32 [[R]]
+;
+  %c = icmp ne i32 0, %x
+  %m = mul i32 %x, %y
+  %r = select i1 %c, i32 %m, i32 0
+  ret i32 %r
+}