Fixups

Author: goldsteinn

llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp

@@ -1520,10 +1520,10 @@ Instruction *InstCombinerImpl::visitAdd(BinaryOperator &I) {
   if (Instruction *R = combineAddSubWithShlAddSub(Builder, I))
     return R;
 
-  if (Instruction *R = foldAddLike(I))
-    return R;
-
   Value *LHS = I.getOperand(0), *RHS = I.getOperand(1);
+  if (Instruction *R =
+          foldAddLike(LHS, RHS, I.hasNoSignedWrap(), I.hasNoUnsignedWrap()))
+    return R;
   Type *Ty = I.getType();
   if (Ty->isIntOrIntVectorTy(1))
     return BinaryOperator::CreateXor(LHS, RHS);
@@ -2296,11 +2296,11 @@ Instruction *InstCombinerImpl::visitSub(BinaryOperator &I) {
       Instruction *R = nullptr;
       if (W == Y)
         R = BinaryOperator::CreateSub(X, Z);
-      if (W == Z)
+      else if (W == Z)
         R = BinaryOperator::CreateSub(X, Y);
-      if (X == Y)
+      else if (X == Y)
         R = BinaryOperator::CreateSub(W, Z);
-      if (X == Z)
+      else if (X == Z)
         R = BinaryOperator::CreateSub(W, Y);
       if (R) {
         bool NSW = I.hasNoSignedWrap() &&

llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp

@@ -3577,7 +3577,8 @@ Instruction *InstCombinerImpl::visitOr(BinaryOperator &I) {
     return R;
 
   if (cast<PossiblyDisjointInst>(I).isDisjoint())
-    if (Instruction *R = foldAddLike(I))
+    if (Instruction *R = foldAddLike(I.getOperand(0), I.getOperand(1),
+                                     /*NSW=*/true, /*NUW=*/true))
       return R;
 
   Value *X, *Y;

llvm/lib/Transforms/InstCombine/InstCombineInternal.h

@@ -586,7 +586,7 @@ class LLVM_LIBRARY_VISIBILITY InstCombinerImpl final
                                unsigned Depth = 0);
 
   /// Common transforms for add / disjoint or
-  Instruction *foldAddLike(BinaryOperator &I);
+  Instruction *foldAddLike(Value *LHS, Value *RHS, bool NSW, bool NUW);
 
   /// Canonicalize the position of binops relative to shufflevector.
   Instruction *foldVectorBinop(BinaryOperator &Inst);

llvm/lib/Transforms/InstCombine/InstructionCombining.cpp

@@ -2008,26 +2008,24 @@ static bool shouldMergeGEPs(GEPOperator &GEP, GEPOperator &Src) {
   return true;
 }
 
-Instruction *InstCombinerImpl::foldAddLike(BinaryOperator &I) {
-  Value *LHS = I.getOperand(0);
-  Value *RHS = I.getOperand(1);
+Instruction *InstCombinerImpl::foldAddLike(Value *LHS, Value *RHS, bool NSW,
+                                           bool NUW) {
   Value *A, *B, *C, *D;
   if (match(LHS, m_Sub(m_Value(A), m_Value(B))) &&
       match(RHS, m_Sub(m_Value(C), m_Value(D)))) {
     Instruction *R = nullptr;
     if (A == D)
       R = BinaryOperator::CreateSub(C, B);
-    if (C == B)
+    else if (C == B)
       R = BinaryOperator::CreateSub(A, D);
     if (R) {
-      bool NSW = match(&I, m_NSWAddLike(m_Value(), m_Value())) &&
-                 match(LHS, m_NSWSub(m_Value(), m_Value())) &&
-                 match(RHS, m_NSWSub(m_Value(), m_Value()));
-
-      bool NUW = match(LHS, m_NUWSub(m_Value(), m_Value())) &&
-                 match(RHS, m_NUWSub(m_Value(), m_Value()));
-      R->setHasNoSignedWrap(NSW);
-      R->setHasNoUnsignedWrap(NUW);
+      bool NSWOut = NSW && match(LHS, m_NSWSub(m_Value(), m_Value())) &&
+                    match(RHS, m_NSWSub(m_Value(), m_Value()));
+
+      bool NUWOut = match(LHS, m_NUWSub(m_Value(), m_Value())) &&
+                    match(RHS, m_NUWSub(m_Value(), m_Value()));
+      R->setHasNoSignedWrap(NSWOut);
+      R->setHasNoUnsignedWrap(NUWOut);
       return R;
     }
   }