fixup! Move to SimplifyDemandedUseBits.

Author: topperc

llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp

@@ -3844,15 +3844,6 @@ Instruction *InstCombinerImpl::visitOr(BinaryOperator &I) {
     }
   }
 
-  // Try to infer the disjoint flag.
-  if (!cast<PossiblyDisjointInst>(I).isDisjoint()) {
-    WithCache<const Value *> LHSCache(Op0), RHSCache(Op1);
-    if (haveNoCommonBitsSet(LHSCache, RHSCache, SQ.getWithInstruction(&I))) {
-      cast<PossiblyDisjointInst>(I).setIsDisjoint(true);
-      return &I;
-    }
-  }
-
   return nullptr;
 }
 

llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp

@@ -264,6 +264,16 @@ Value *InstCombinerImpl::SimplifyDemandedUseBits(Value *V, APInt DemandedMask,
     if (ShrinkDemandedConstant(I, 1, DemandedMask))
       return I;
 
+    // Infer disjoint flag if no common bits are set.
+    if (!cast<PossiblyDisjointInst>(I)->isDisjoint()) {
+      WithCache<const Value *> LHSCache(I->getOperand(0), LHSKnown),
+          RHSCache(I->getOperand(1), RHSKnown);
+      if (haveNoCommonBitsSet(LHSCache, RHSCache, SQ.getWithInstruction(I))) {
+        cast<PossiblyDisjointInst>(I)->setIsDisjoint(true);
+        return I;
+      }
+    }
+
     break;
   }
   case Instruction::Xor: {