forked from OSchip/llvm-project
Re-commit r347419 "Update call to EvaluateAsInt() to the new syntax."
llvm-svn: 347757
This commit is contained in:
parent
48ee4ad325
commit
cab8dd692e
|
@ -65,16 +65,16 @@ static unsigned getMaxCalculationWidth(const ASTContext &Context,
|
|||
if (Bop->getOpcode() == BO_Add)
|
||||
return std::max(LHSWidth, RHSWidth) + 1;
|
||||
if (Bop->getOpcode() == BO_Rem) {
|
||||
llvm::APSInt Val;
|
||||
if (Bop->getRHS()->EvaluateAsInt(Val, Context))
|
||||
return Val.getActiveBits();
|
||||
Expr::EvalResult Result;
|
||||
if (Bop->getRHS()->EvaluateAsInt(Result, Context))
|
||||
return Result.Val.getInt().getActiveBits();
|
||||
} else if (Bop->getOpcode() == BO_Shl) {
|
||||
llvm::APSInt Bits;
|
||||
if (Bop->getRHS()->EvaluateAsInt(Bits, Context)) {
|
||||
Expr::EvalResult Result;
|
||||
if (Bop->getRHS()->EvaluateAsInt(Result, Context)) {
|
||||
// We don't handle negative values and large values well. It is assumed
|
||||
// that compiler warnings are written for such values so the user will
|
||||
// fix that.
|
||||
return LHSWidth + Bits.getExtValue();
|
||||
return LHSWidth + Result.Val.getInt().getExtValue();
|
||||
}
|
||||
|
||||
// Unknown bitcount, assume there is truncation.
|
||||
|
|
|
@ -76,10 +76,13 @@ void SuspiciousMemsetUsageCheck::check(const MatchFinder::MatchResult &Result) {
|
|||
// Case 2: fill_char of memset() is larger in size than an unsigned char
|
||||
// so it gets truncated during conversion.
|
||||
|
||||
llvm::APSInt NumValue;
|
||||
const auto UCharMax = (1 << Result.Context->getCharWidth()) - 1;
|
||||
if (!NumFill->EvaluateAsInt(NumValue, *Result.Context) ||
|
||||
(NumValue >= 0 && NumValue <= UCharMax))
|
||||
Expr::EvalResult EVResult;
|
||||
if (!NumFill->EvaluateAsInt(EVResult, *Result.Context))
|
||||
return;
|
||||
|
||||
llvm::APSInt NumValue = EVResult.Val.getInt();
|
||||
if (NumValue >= 0 && NumValue <= UCharMax)
|
||||
return;
|
||||
|
||||
diag(NumFill->getBeginLoc(), "memset fill value is out of unsigned "
|
||||
|
@ -94,18 +97,22 @@ void SuspiciousMemsetUsageCheck::check(const MatchFinder::MatchResult &Result) {
|
|||
const Expr *ByteCount = Call->getArg(2);
|
||||
|
||||
// Return if `byte_count` is not zero at compile time.
|
||||
llvm::APSInt Value1, Value2;
|
||||
Expr::EvalResult Value2;
|
||||
if (ByteCount->isValueDependent() ||
|
||||
!ByteCount->EvaluateAsInt(Value2, *Result.Context) || Value2 != 0)
|
||||
!ByteCount->EvaluateAsInt(Value2, *Result.Context) ||
|
||||
Value2.Val.getInt() != 0)
|
||||
return;
|
||||
|
||||
// Return if `fill_char` is known to be zero or negative at compile
|
||||
// time. In these cases, swapping the args would be a nop, or
|
||||
// introduce a definite bug. The code is likely correct.
|
||||
Expr::EvalResult EVResult;
|
||||
if (!FillChar->isValueDependent() &&
|
||||
FillChar->EvaluateAsInt(Value1, *Result.Context) &&
|
||||
(Value1 == 0 || Value1.isNegative()))
|
||||
return;
|
||||
FillChar->EvaluateAsInt(EVResult, *Result.Context)) {
|
||||
llvm::APSInt Value1 = EVResult.Val.getInt();
|
||||
if (Value1 == 0 || Value1.isNegative())
|
||||
return;
|
||||
}
|
||||
|
||||
// `byte_count` is known to be zero at compile time, and `fill_char` is
|
||||
// either not known or known to be a positive integer. Emit a warning
|
||||
|
|
|
@ -101,8 +101,8 @@ void ProperlySeededRandomGeneratorCheck::checkSeed(
|
|||
return;
|
||||
}
|
||||
|
||||
llvm::APSInt Value;
|
||||
if (Func->getArg(0)->EvaluateAsInt(Value, *Result.Context)) {
|
||||
Expr::EvalResult EVResult;
|
||||
if (Func->getArg(0)->EvaluateAsInt(EVResult, *Result.Context)) {
|
||||
diag(Func->getExprLoc(),
|
||||
"random number generator seeded with a constant value will generate a "
|
||||
"predictable sequence of values");
|
||||
|
|
Loading…
Reference in New Issue