diff --git a/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp b/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp
--- a/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp
@@ -1397,6 +1397,16 @@
     return &I;
   }
 
+  // (add A (or A, -A)) --> (and (add A, -1) A)
+  // (add A (or -A, A)) --> (and (add A, -1) A)
+  // (add (or A, -A) A) --> (and (add A, -1) A)
+  // (add (or -A, A) A) --> (and (add A, -1) A)
+  if (match(&I, m_c_BinOp(m_Value(A),
+                          m_c_Or(m_Neg(m_Deferred(A)), m_Deferred(A))))) {
+    Value *Add = Builder.CreateAdd(A, Constant::getAllOnesValue(A->getType()));
+    return BinaryOperator::CreateAnd(Add, A);
+  }
+
   // Canonicalize ((A & -A) - 1) --> ((A - 1) & ~A)
   // Forms all commutable operations, and simplifies ctpop -> cttz folds.
   if (match(&I,
diff --git a/llvm/test/Transforms/InstCombine/add_or_sub.ll b/llvm/test/Transforms/InstCombine/add_or_sub.ll
--- a/llvm/test/Transforms/InstCombine/add_or_sub.ll
+++ b/llvm/test/Transforms/InstCombine/add_or_sub.ll
@@ -7,9 +7,8 @@
 
 define i32 @add_or_sub_comb_i32_commuted1(i32 %x) {
 ; CHECK-LABEL: @add_or_sub_comb_i32_commuted1(
-; CHECK-NEXT:    [[SUB:%.*]] = sub i32 0, [[X:%.*]]
-; CHECK-NEXT:    [[OR:%.*]] = or i32 [[SUB]], [[X]]
-; CHECK-NEXT:    [[ADD:%.*]] = add i32 [[OR]], [[X]]
+; CHECK-NEXT:    [[TMP1:%.*]] = add i32 [[X:%.*]], -1
+; CHECK-NEXT:    [[ADD:%.*]] = and i32 [[TMP1]], [[X]]
 ; CHECK-NEXT:    ret i32 [[ADD]]
 ;
   %sub = sub i32 0, %x
@@ -21,9 +20,8 @@
 define i8 @add_or_sub_comb_i8_commuted2(i8 %p) {
 ; CHECK-LABEL: @add_or_sub_comb_i8_commuted2(
 ; CHECK-NEXT:    [[X:%.*]] = mul i8 [[P:%.*]], [[P]]
-; CHECK-NEXT:    [[SUB:%.*]] = sub i8 0, [[X]]
-; CHECK-NEXT:    [[OR:%.*]] = or i8 [[X]], [[SUB]]
-; CHECK-NEXT:    [[ADD:%.*]] = add i8 [[X]], [[OR]]
+; CHECK-NEXT:    [[TMP1:%.*]] = add i8 [[X]], -1
+; CHECK-NEXT:    [[ADD:%.*]] = and i8 [[TMP1]], [[X]]
 ; CHECK-NEXT:    ret i8 [[ADD]]
 ;
   %x = mul i8 %p, %p ; thwart complexity-based canonicalization
@@ -36,9 +34,8 @@
 define i128 @add_or_sub_comb_i128_commuted3(i128 %p) {
 ; CHECK-LABEL: @add_or_sub_comb_i128_commuted3(
 ; CHECK-NEXT:    [[X:%.*]] = mul i128 [[P:%.*]], [[P]]
-; CHECK-NEXT:    [[SUB:%.*]] = sub i128 0, [[X]]
-; CHECK-NEXT:    [[OR:%.*]] = or i128 [[X]], [[SUB]]
-; CHECK-NEXT:    [[ADD:%.*]] = add i128 [[OR]], [[X]]
+; CHECK-NEXT:    [[TMP1:%.*]] = add i128 [[X]], -1
+; CHECK-NEXT:    [[ADD:%.*]] = and i128 [[TMP1]], [[X]]
 ; CHECK-NEXT:    ret i128 [[ADD]]
 ;
   %x = mul i128 %p, %p ; thwart complexity-based canonicalization
@@ -51,9 +48,8 @@
 define i64 @add_or_sub_comb_i64_commuted4(i64 %p) {
 ; CHECK-LABEL: @add_or_sub_comb_i64_commuted4(
 ; CHECK-NEXT:    [[X:%.*]] = mul i64 [[P:%.*]], [[P]]
-; CHECK-NEXT:    [[SUB:%.*]] = sub i64 0, [[X]]
-; CHECK-NEXT:    [[OR:%.*]] = or i64 [[X]], [[SUB]]
-; CHECK-NEXT:    [[ADD:%.*]] = add i64 [[X]], [[OR]]
+; CHECK-NEXT:    [[TMP1:%.*]] = add i64 [[X]], -1
+; CHECK-NEXT:    [[ADD:%.*]] = and i64 [[TMP1]], [[X]]
 ; CHECK-NEXT:    ret i64 [[ADD]]
 ;
   %x = mul i64 %p, %p ; thwart complexity-based canonicalization
@@ -66,9 +62,8 @@
 define <3 x i32> @add_or_sub_comb_i32vec(<3 x i32> %p) {
 ; CHECK-LABEL: @add_or_sub_comb_i32vec(
 ; CHECK-NEXT:    [[X:%.*]] = mul <3 x i32> [[P:%.*]], [[P]]
-; CHECK-NEXT:    [[SUB:%.*]] = sub <3 x i32> zeroinitializer, [[X]]
-; CHECK-NEXT:    [[OR:%.*]] = or <3 x i32> [[X]], [[SUB]]
-; CHECK-NEXT:    [[ADD:%.*]] = add <3 x i32> [[OR]], [[X]]
+; CHECK-NEXT:    [[TMP1:%.*]] = add <3 x i32> [[X]], <i32 -1, i32 -1, i32 -1>
+; CHECK-NEXT:    [[ADD:%.*]] = and <3 x i32> [[TMP1]], [[X]]
 ; CHECK-NEXT:    ret <3 x i32> [[ADD]]
 ;
   %x = mul <3 x i32> %p, %p ; thwart complexity-based canonicalization
@@ -96,8 +91,8 @@
 ; CHECK-NEXT:    [[X:%.*]] = mul i12 [[P:%.*]], [[P]]
 ; CHECK-NEXT:    [[SUB:%.*]] = sub i12 0, [[X]]
 ; CHECK-NEXT:    call void @use12(i12 [[SUB]])
-; CHECK-NEXT:    [[OR:%.*]] = or i12 [[X]], [[SUB]]
-; CHECK-NEXT:    [[ADD:%.*]] = add i12 [[OR]], [[X]]
+; CHECK-NEXT:    [[TMP1:%.*]] = add i12 [[X]], -1
+; CHECK-NEXT:    [[ADD:%.*]] = and i12 [[TMP1]], [[X]]
 ; CHECK-NEXT:    ret i12 [[ADD]]
 ;
   %x = mul i12 %p, %p ; thwart complexity-based canonicalization
@@ -114,7 +109,8 @@
 ; CHECK-NEXT:    [[SUB:%.*]] = sub i2 0, [[X]]
 ; CHECK-NEXT:    [[OR:%.*]] = or i2 [[X]], [[SUB]]
 ; CHECK-NEXT:    call void @use2(i2 [[OR]])
-; CHECK-NEXT:    [[ADD:%.*]] = add i2 [[OR]], [[X]]
+; CHECK-NEXT:    [[TMP1:%.*]] = add i2 [[X]], -1
+; CHECK-NEXT:    [[ADD:%.*]] = and i2 [[TMP1]], [[X]]
 ; CHECK-NEXT:    ret i2 [[ADD]]
 ;
   %x = mul i2 %p, %p ; thwart complexity-based canonicalization
@@ -132,7 +128,8 @@
 ; CHECK-NEXT:    call void @use19(i19 [[SUB]])
 ; CHECK-NEXT:    [[OR:%.*]] = or i19 [[X]], [[SUB]]
 ; CHECK-NEXT:    call void @use19(i19 [[OR]])
-; CHECK-NEXT:    [[ADD:%.*]] = add i19 [[OR]], [[X]]
+; CHECK-NEXT:    [[TMP1:%.*]] = add i19 [[X]], -1
+; CHECK-NEXT:    [[ADD:%.*]] = and i19 [[TMP1]], [[X]]
 ; CHECK-NEXT:    ret i19 [[ADD]]
 ;
   %x = mul i19 %p, %p ; thwart complexity-based canonicalization
@@ -147,9 +144,8 @@
 define i10 @add_or_sub_comb_i10_nsw_nuw(i10 %p) {
 ; CHECK-LABEL: @add_or_sub_comb_i10_nsw_nuw(
 ; CHECK-NEXT:    [[X:%.*]] = mul i10 [[P:%.*]], [[P]]
-; CHECK-NEXT:    [[SUB:%.*]] = sub i10 0, [[X]]
-; CHECK-NEXT:    [[OR:%.*]] = or i10 [[X]], [[SUB]]
-; CHECK-NEXT:    [[ADD:%.*]] = add nuw nsw i10 [[OR]], [[X]]
+; CHECK-NEXT:    [[TMP1:%.*]] = add i10 [[X]], -1
+; CHECK-NEXT:    [[ADD:%.*]] = and i10 [[TMP1]], [[X]]
 ; CHECK-NEXT:    ret i10 [[ADD]]
 ;
   %x = mul i10 %p, %p ; thwart complexity-based canonicalization