Skip to content

Commit 917a550

Browse files
authored
[clang][Analyzer][NFC] Use condition type for comparison in several checkers (#72358)
1 parent d5af076 commit 917a550

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

clang/lib/StaticAnalyzer/Checkers/CStringChecker.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -881,8 +881,8 @@ SVal CStringChecker::getCStringLengthForRegion(CheckerContext &C,
881881
const llvm::APSInt *maxLengthInt = BVF.evalAPSInt(BO_Div, maxValInt,
882882
fourInt);
883883
NonLoc maxLength = svalBuilder.makeIntVal(*maxLengthInt);
884-
SVal evalLength = svalBuilder.evalBinOpNN(state, BO_LE, *strLn,
885-
maxLength, sizeTy);
884+
SVal evalLength = svalBuilder.evalBinOpNN(state, BO_LE, *strLn, maxLength,
885+
svalBuilder.getConditionType());
886886
state = state->assume(evalLength.castAs<DefinedOrUnknownSVal>(), true);
887887
}
888888
state = state->set<CStringLength>(MR, strLength);

clang/lib/StaticAnalyzer/Checkers/StreamChecker.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -725,9 +725,9 @@ void StreamChecker::evalFreadFwrite(const FnDescription *Desc,
725725
NonLoc RetVal = makeRetVal(C, CE).castAs<NonLoc>();
726726
ProgramStateRef StateFailed =
727727
State->BindExpr(CE, C.getLocationContext(), RetVal);
728+
SValBuilder &SVB = C.getSValBuilder();
728729
auto Cond =
729-
C.getSValBuilder()
730-
.evalBinOpNN(State, BO_LT, RetVal, *NMembVal, C.getASTContext().IntTy)
730+
SVB.evalBinOpNN(State, BO_LT, RetVal, *NMembVal, SVB.getConditionType())
731731
.getAs<DefinedOrUnknownSVal>();
732732
if (!Cond)
733733
return;

clang/lib/StaticAnalyzer/Checkers/VLASizeChecker.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,8 @@ ProgramStateRef VLASizeChecker::checkVLAIndexSize(CheckerContext &C,
188188
QualType SizeTy = SizeE->getType();
189189
DefinedOrUnknownSVal Zero = SVB.makeZeroVal(SizeTy);
190190

191-
SVal LessThanZeroVal = SVB.evalBinOp(State, BO_LT, SizeD, Zero, SizeTy);
191+
SVal LessThanZeroVal =
192+
SVB.evalBinOp(State, BO_LT, SizeD, Zero, SVB.getConditionType());
192193
if (std::optional<DefinedSVal> LessThanZeroDVal =
193194
LessThanZeroVal.getAs<DefinedSVal>()) {
194195
ConstraintManager &CM = C.getConstraintManager();

0 commit comments

Comments
 (0)