diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp
index 34c5fb3375d..db2c997d3fb 100644
--- a/lib/Transforms/Scalar/InstructionCombining.cpp
+++ b/lib/Transforms/Scalar/InstructionCombining.cpp
@@ -4438,22 +4438,19 @@ Instruction *InstCombiner::FoldOrWithConstants(BinaryOperator &I, Value *Op,
   if (!CI1) return 0;
 
   Value *V1 = 0, *C2 = 0;
-  if (match(Op, m_And(m_Value(V1), m_Value(C2)))) {
-    ConstantInt *CI2 = dyn_cast<ConstantInt>(C2);
-    if (!CI2) return 0;
+  if (!match(Op, m_And(m_Value(V1), m_ConstantInt(C2)))) return 0;
 
-    APInt Xor = CI1->getValue() ^ CI2->getValue();
-    if (Xor.isAllOnesValue()) {
-      if (V1 == B) {
-        Instruction *NewOp =
-          InsertNewInstBefore(BinaryOperator::CreateAnd(A, CI1), I);
-        return BinaryOperator::CreateOr(NewOp, B);
-      } else if (V1 == A) {
-        Instruction *NewOp =
-          InsertNewInstBefore(BinaryOperator::CreateAnd(B, CI1), I);
-        return BinaryOperator::CreateOr(NewOp, A);
-      }
-    }
+  APInt Xor = CI1->getValue() ^ CI2->getValue();
+  if (!Xor.isAllOnesValue()) return 0;
+
+  if (V1 == B) {
+    Instruction *NewOp =
+      InsertNewInstBefore(BinaryOperator::CreateAnd(A, CI1), I);
+    return BinaryOperator::CreateOr(NewOp, B);
+  } else if (V1 == A) {
+    Instruction *NewOp =
+      InsertNewInstBefore(BinaryOperator::CreateAnd(B, CI1), I);
+    return BinaryOperator::CreateOr(NewOp, A);
   }
 
   return 0;