[llvm] r315709 - [InstCombine] use AddOne helper to reduce code; NFC

[Sanjay Patel via llvm-commits]

Author: spatel
Date: Fri Oct 13 10:00:47 2017
New Revision: 315709

URL: http://llvm.org/viewvc/llvm-project?rev=315709&view=rev
Log:
[InstCombine] use AddOne helper to reduce code; NFC

Modified:
    llvm/trunk/lib/Transforms/InstCombine/InstCombineAddSub.cpp

Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineAddSub.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineAddSub.cpp?rev=315709&r1=315708&r2=315709&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/InstCombine/InstCombineAddSub.cpp (original)
+++ llvm/trunk/lib/Transforms/InstCombine/InstCombineAddSub.cpp Fri Oct 13 10:00:47 2017
@@ -960,13 +960,9 @@ Instruction *InstCombiner::foldAddWithCo
     return NV;
 
   Value *X;
-  Type *Ty = Add.getType();
-  if (match(Op0, m_ZExt(m_Value(X))) &&
-      X->getType()->getScalarSizeInBits() == 1) {
+  if (match(Op0, m_ZExt(m_Value(X))) && X->getType()->getScalarSizeInBits() == 1)
     // zext(bool) + C -> bool ? C + 1 : C
-    Constant *One = ConstantInt::get(Ty, 1);
-    return SelectInst::Create(X, ConstantExpr::getAdd(Op1C, One), Op1);
-  }
+    return SelectInst::Create(X, AddOne(Op1C), Op1);
 
   const APInt *C;
   if (!match(Op1, m_APInt(C)))
@@ -985,6 +981,7 @@ Instruction *InstCombiner::foldAddWithCo
 
   // Is this add the last step in a convoluted sext?
   // add(zext(xor i16 X, -32768), -32768) --> sext X
+  Type *Ty = Add.getType();
   const APInt *C2;
   if (match(Op0, m_ZExt(m_Xor(m_Value(X), m_APInt(C2)))) &&
       C2->isMinSignedValue() && C2->sext(Ty->getScalarSizeInBits()) == *C)