Update InstCombineAddSub.cpp

Author: AZero13

llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp

@@ -1691,26 +1691,24 @@ Instruction *InstCombinerImpl::visitAdd(BinaryOperator &I) {
 
   // Handle constant case: sext(x > C1) + zext(x < C2) where C2 = C1 + 1
   // This represents (x >= C1+1) - (x <= C1+1) => scmp/ucmp(x, C1+1)
-  Value *X, *Const1, *Const2;
+  Value *X;
+  ConstantInt *Const1, *Const2;
   CmpPredicate Pred1, Pred2;
   if (match(&I,
-            m_c_Add(m_SExt(m_c_ICmp(Pred1, m_Value(X), m_Value(Const1))),
-                    m_ZExt(m_c_ICmp(Pred2, m_Deferred(X), m_Value(Const2))))) &&
-      X->getType()->isIntOrIntVectorTy() && isa<ConstantInt>(Const1) &&
-      isa<ConstantInt>(Const2)) {
+            m_c_Add(
+                m_SExt(m_ICmp(Pred1, m_Value(X), m_ConstantInt(Const1))),
+                m_ZExt(m_ICmp(Pred2, m_Deferred(X), m_ConstantInt(Const2))))) &&
+      X->getType()->isIntOrIntVectorTy()) {
 
     // Check if we have x > C1 and x < C2 where C2 = C1 + 2
     if (ICmpInst::isGT(Pred1) && ICmpInst::isLT(Pred2)) {
-      ConstantInt *ConstC1 = cast<ConstantInt>(Const1);
-      ConstantInt *ConstC2 = cast<ConstantInt>(Const2);
-
       // Check if C2 = C1 + 2
-      if (ConstC2->getValue() == ConstC1->getValue() + 2) {
+      if (Const2->getValue() == Const1->getValue() + 2) {
         // This represents (x >= C1+1) - (x <= C1+1) => scmp/ucmp(x, C1+1)
         Intrinsic::ID IID =
             ICmpInst::isSigned(Pred1) ? Intrinsic::scmp : Intrinsic::ucmp;
         Constant *C1Plus1 =
-            ConstantInt::get(Const1->getType(), ConstC1->getValue() + 1);
+            ConstantInt::get(Const1->getType(), Const1->getValue() + 1);
         return replaceInstUsesWith(
             I, Builder.CreateIntrinsic(Ty, IID, {X, C1Plus1}));
       }