vsavchenko updated this revision to Diff 331863. vsavchenko added a comment.
Fix typos in comments Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D98948/new/ https://reviews.llvm.org/D98948 Files: clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp clang/test/Analysis/PR49642.c
Index: clang/test/Analysis/PR49642.c =================================================================== --- /dev/null +++ clang/test/Analysis/PR49642.c @@ -0,0 +1,20 @@ +// RUN: %clang --analyze -Xclang -analyzer-checker=core %s + +typedef ssize_t; +b; + +unsigned c; +int write(int, const void *, unsigned long); + +a() { + d(); + while (c > 0) { + b = write(0, d, c); + if (b) + c -= b; + b < 1; + } + if (c && c) { + // ^ no-crash + } +} Index: clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp =================================================================== --- clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp +++ clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp @@ -448,12 +448,12 @@ EquivalenceClass Other); /// Return a set of class members for the given state. - LLVM_NODISCARD inline SymbolSet getClassMembers(ProgramStateRef State); + LLVM_NODISCARD inline SymbolSet getClassMembers(ProgramStateRef State) const; /// Return true if the current class is trivial in the given state. - LLVM_NODISCARD inline bool isTrivial(ProgramStateRef State); + LLVM_NODISCARD inline bool isTrivial(ProgramStateRef State) const; /// Return true if the current class is trivial and its only member is dead. LLVM_NODISCARD inline bool isTriviallyDead(ProgramStateRef State, - SymbolReaper &Reaper); + SymbolReaper &Reaper) const; LLVM_NODISCARD static inline ProgramStateRef markDisequal(BasicValueFactory &BV, RangeSet::Factory &F, @@ -521,7 +521,7 @@ ProgramStateRef State, SymbolSet Members, EquivalenceClass Other, SymbolSet OtherMembers); - static inline void + static inline bool addToDisequalityInfo(DisequalityMapTy &Info, ConstraintRangeTy &Constraints, BasicValueFactory &BV, RangeSet::Factory &F, ProgramStateRef State, EquivalenceClass First, @@ -535,6 +535,15 @@ // Constraint functions //===----------------------------------------------------------------------===// +LLVM_NODISCARD LLVM_ATTRIBUTE_UNUSED bool +areFeasible(ConstraintRangeTy Constraints) { + return llvm::none_of( + Constraints, + [](const std::pair<EquivalenceClass, RangeSet> &ClassConstraint) { + return ClassConstraint.second.isEmpty(); + }); +} + LLVM_NODISCARD inline const RangeSet *getConstraint(ProgramStateRef State, EquivalenceClass Class) { return State->get<ConstraintRange>(Class); @@ -1397,15 +1406,6 @@ return EquivalenceClass::merge(getBasicVals(), F, State, LHS, RHS); } - LLVM_NODISCARD LLVM_ATTRIBUTE_UNUSED static bool - areFeasible(ConstraintRangeTy Constraints) { - return llvm::none_of( - Constraints, - [](const std::pair<EquivalenceClass, RangeSet> &ClassConstraint) { - return ClassConstraint.second.isEmpty(); - }); - } - LLVM_NODISCARD ProgramStateRef setConstraint(ProgramStateRef State, EquivalenceClass Class, RangeSet Constraint) { @@ -1428,7 +1428,7 @@ getRange(State, DisequalClass).Delete(getBasicVals(), F, *Point); // If we end up with at least one of the disequal classes to be - // constrainted with an empty range-set, the state is infeasible. + // constrained with an empty range-set, the state is infeasible. if (UpdatedConstraint.isEmpty()) return nullptr; @@ -1574,6 +1574,9 @@ // Assign new constraints for this class. Constraints = CRF.add(Constraints, *this, *NewClassConstraint); + assert(areFeasible(Constraints) && "Constraint manager shouldn't produce " + "a state with infeasible constraints"); + State = State->set<ConstraintRange>(Constraints); } @@ -1644,7 +1647,7 @@ return State->get_context<SymbolSet>(); } -SymbolSet EquivalenceClass::getClassMembers(ProgramStateRef State) { +SymbolSet EquivalenceClass::getClassMembers(ProgramStateRef State) const { if (const SymbolSet *Members = State->get<ClassMembers>(*this)) return *Members; @@ -1654,12 +1657,12 @@ return F.add(F.getEmptySet(), getRepresentativeSymbol()); } -bool EquivalenceClass::isTrivial(ProgramStateRef State) { +bool EquivalenceClass::isTrivial(ProgramStateRef State) const { return State->get<ClassMembers>(*this) == nullptr; } bool EquivalenceClass::isTriviallyDead(ProgramStateRef State, - SymbolReaper &Reaper) { + SymbolReaper &Reaper) const { return isTrivial(State) && Reaper.isDead(getRepresentativeSymbol()); } @@ -1694,10 +1697,14 @@ // Disequality is a symmetric relation, so if we mark A as disequal to B, // we should also mark B as disequalt to A. - addToDisequalityInfo(DisequalityInfo, Constraints, VF, RF, State, *this, - Other); - addToDisequalityInfo(DisequalityInfo, Constraints, VF, RF, State, Other, - *this); + if (!addToDisequalityInfo(DisequalityInfo, Constraints, VF, RF, State, *this, + Other) || + !addToDisequalityInfo(DisequalityInfo, Constraints, VF, RF, State, Other, + *this)) + return nullptr; + + assert(areFeasible(Constraints) && "Constraint manager shouldn't produce " + "a state with infeasible constraints"); State = State->set<DisequalityMap>(DisequalityInfo); State = State->set<ConstraintRange>(Constraints); @@ -1705,7 +1712,7 @@ return State; } -inline void EquivalenceClass::addToDisequalityInfo( +inline bool EquivalenceClass::addToDisequalityInfo( DisequalityMapTy &Info, ConstraintRangeTy &Constraints, BasicValueFactory &VF, RangeSet::Factory &RF, ProgramStateRef State, EquivalenceClass First, EquivalenceClass Second) { @@ -1734,8 +1741,16 @@ VF, RF, State, First.getRepresentativeSymbol()); FirstConstraint = FirstConstraint.Delete(VF, RF, *Point); + + // If the First class is about to be constrained with an empty + // range-set, the state is infeasible. + if (FirstConstraint.isEmpty()) + return false; + Constraints = CRF.add(Constraints, First, FirstConstraint); } + + return true; } inline Optional<bool> EquivalenceClass::areEqual(ProgramStateRef State,
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits