Fix PR2341 - when the length is 4 use an i32 not
an i16! Cleaned up trailing whitespace while there.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@51240 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Transforms/Scalar/SimplifyLibCalls.cpp b/lib/Transforms/Scalar/SimplifyLibCalls.cpp
index 2b5b2b0..cb90bdc 100644
--- a/lib/Transforms/Scalar/SimplifyLibCalls.cpp
+++ b/lib/Transforms/Scalar/SimplifyLibCalls.cpp
@@ -731,17 +731,17 @@
!isa<PointerType>(FT->getParamType(1)) ||
FT->getReturnType() != Type::Int32Ty)
return 0;
-
+
Value *LHS = CI->getOperand(1), *RHS = CI->getOperand(2);
-
+
if (LHS == RHS) // memcmp(s,s,x) -> 0
return Constant::getNullValue(CI->getType());
-
+
// Make sure we have a constant length.
ConstantInt *LenC = dyn_cast<ConstantInt>(CI->getOperand(3));
if (!LenC) return 0;
uint64_t Len = LenC->getZExtValue();
-
+
if (Len == 0) // memcmp(s1,s2,0) -> 0
return Constant::getNullValue(CI->getType());
@@ -750,18 +750,20 @@
Value *RHSV = B.CreateLoad(CastToCStr(RHS, B), "rhsv");
return B.CreateZExt(B.CreateSub(LHSV, RHSV, "chardiff"), CI->getType());
}
-
+
// memcmp(S1,S2,2) != 0 -> (*(short*)LHS ^ *(short*)RHS) != 0
// memcmp(S1,S2,4) != 0 -> (*(int*)LHS ^ *(int*)RHS) != 0
if ((Len == 2 || Len == 4) && IsOnlyUsedInZeroEqualityComparison(CI)) {
- LHS = B.CreateBitCast(LHS, PointerType::getUnqual(Type::Int16Ty), "tmp");
- RHS = B.CreateBitCast(RHS, LHS->getType(), "tmp");
+ const Type *PTy = PointerType::getUnqual(Len == 2 ?
+ Type::Int16Ty : Type::Int32Ty);
+ LHS = B.CreateBitCast(LHS, PTy, "tmp");
+ RHS = B.CreateBitCast(RHS, PTy, "tmp");
LoadInst *LHSV = B.CreateLoad(LHS, "lhsv");
LoadInst *RHSV = B.CreateLoad(RHS, "rhsv");
LHSV->setAlignment(1); RHSV->setAlignment(1); // Unaligned loads.
return B.CreateZExt(B.CreateXor(LHSV, RHSV, "shortdiff"), CI->getType());
}
-
+
return 0;
}
};