From 293c4efa8d4e5e7b5ea2b3dd092ffc82ed8ca7b9 Mon Sep 17 00:00:00 2001 From: Sanjay Patel Date: Fri, 1 Feb 2019 14:37:49 +0000 Subject: [PATCH] [InstCombine] reduce duplicate code; NFC An unused variable problem was introduced with rL352870 and stubbed out with rL352871, but we can make a better fix by actually using the local variable in code rather than just the assert. llvm-svn: 352873 --- lib/Transforms/InstCombine/InstCombineCalls.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/Transforms/InstCombine/InstCombineCalls.cpp b/lib/Transforms/InstCombine/InstCombineCalls.cpp index caed651571a..811b0fd4f11 100644 --- a/lib/Transforms/InstCombine/InstCombineCalls.cpp +++ b/lib/Transforms/InstCombine/InstCombineCalls.cpp @@ -761,7 +761,6 @@ static Value *simplifyX86addcarry(const IntrinsicInst &II, assert(RetTy->getStructElementType(0)->isIntegerTy(8) && RetTy->getStructElementType(1) == OpTy && OpTy == Op2->getType() && "Unexpected types for x86 addcarry"); - (void)RetTy; // If carry-in is zero, this is just an unsigned add with overflow. if (match(CarryIn, m_ZeroInt())) { @@ -771,7 +770,7 @@ static Value *simplifyX86addcarry(const IntrinsicInst &II, Value *UAddResult = Builder.CreateExtractValue(UAdd, 0); Value *UAddOV = Builder.CreateZExt(Builder.CreateExtractValue(UAdd, 1), Builder.getInt8Ty()); - Value *Res = UndefValue::get(II.getType()); + Value *Res = UndefValue::get(RetTy); Res = Builder.CreateInsertValue(Res, UAddOV, 0); return Builder.CreateInsertValue(Res, UAddResult, 1); }