!fixup add and use CreateBinOpDisjoint.

Author: fhahn

llvm/include/llvm/IR/IRBuilder.h

@@ -1575,14 +1575,10 @@ class IRBuilderBase {
     return Accum;
   }
 
-  Value *CreateOr(Value *LHS, Value *RHS, const Twine &Name = "",
-                  bool IsDisjoint = false) {
+  Value *CreateOr(Value *LHS, Value *RHS, const Twine &Name = "") {
     if (auto *V = Folder.FoldBinOp(Instruction::Or, LHS, RHS))
       return V;
-    return Insert(
-        IsDisjoint ? BinaryOperator::CreateDisjoint(Instruction::Or, LHS, RHS)
-                   : BinaryOperator::CreateOr(LHS, RHS),
-        Name);
+    return Insert(BinaryOperator::CreateOr(LHS, RHS), Name);
   }
 
   Value *CreateOr(Value *LHS, const APInt &RHS, const Twine &Name = "") {
@@ -1727,6 +1723,18 @@ class IRBuilderBase {
     return Insert(BinOp, Name);
   }
 
+  Value *CreateBinOpDisjoint(BinaryOperator::BinaryOps Opc, Value *LHS,
+                             Value *RHS, bool IsDisjoint,
+                             const Twine &Name = "") {
+    if (Value *V = Folder.FoldBinOp(Opc, LHS, RHS))
+      return V;
+
+    BinaryOperator *BO =
+        Insert(BinaryOperator::CreateDisjoint(Opc, LHS, RHS), Name);
+    cast<PossiblyDisjointInst>(BO)->setIsDisjoint(IsDisjoint);
+    return BO;
+  }
+
   Value *CreateLogicalAnd(Value *Cond1, Value *Cond2, const Twine &Name = "") {
     assert(Cond2->getType()->isIntOrIntVectorTy(1));
     return CreateSelect(Cond1, Cond2,

llvm/lib/Transforms/Vectorize/VectorCombine.cpp

@@ -1462,9 +1462,9 @@ bool VectorCombine::foldBinopOfReductions(Instruction &I) {
                     << "\n  OldCost: " << OldCost << " vs NewCost: " << NewCost
                     << "\n");
   Value *VectorBO;
-  if (BinOpOpc == Instruction::Or)
-    VectorBO = Builder.CreateOr(V0, V1, "",
-                                cast<PossiblyDisjointInst>(I).isDisjoint());
+  if (auto *PDInst = dyn_cast<PossiblyDisjointInst>(&I))
+    VectorBO =
+        Builder.CreateBinOpDisjoint(BinOpOpc, V0, V1, PDInst->isDisjoint(), "");
   else
     VectorBO = Builder.CreateBinOp(BinOpOpc, V0, V1);