Author: Denys Petrov Date: 2020-05-06T14:16:39+03:00 New Revision: ba8cda989cf884d53596099dc38a0e5a2c351074
URL: https://github.com/llvm/llvm-project/commit/ba8cda989cf884d53596099dc38a0e5a2c351074 DIFF: https://github.com/llvm/llvm-project/commit/ba8cda989cf884d53596099dc38a0e5a2c351074.diff LOG: [analyzer] Stability improvement for IteratorModeling Summary: Some function path may lead to crash. Fixed using local variable outside the scope through a pointer. Fixed minor misspellings. Added regression test. This patch covers a bug https://bugs.llvm.org/show_bug.cgi?id=41485 Reviewed By: baloghadamsoftware Differential Revision: https://reviews.llvm.org/D78289 Added: Modified: clang/lib/StaticAnalyzer/Checkers/IteratorModeling.cpp clang/test/Analysis/iterator-range.cpp Removed: ################################################################################ diff --git a/clang/lib/StaticAnalyzer/Checkers/IteratorModeling.cpp b/clang/lib/StaticAnalyzer/Checkers/IteratorModeling.cpp index 2850c6d39322..e35918edbf89 100644 --- a/clang/lib/StaticAnalyzer/Checkers/IteratorModeling.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/IteratorModeling.cpp @@ -402,7 +402,7 @@ void IteratorModeling::handleComparison(CheckerContext &C, const Expr *CE, if (!Cont) return; - // At least one of the iterators have recorded positions. If one of them has + // At least one of the iterators has recorded positions. If one of them does // not then create a new symbol for the offset. SymbolRef Sym; if (!LPos || !RPos) { @@ -422,7 +422,7 @@ void IteratorModeling::handleComparison(CheckerContext &C, const Expr *CE, RPos = getIteratorPosition(State, RVal); } - // We cannot make assumpotions on `UnknownVal`. Let us conjure a symbol + // We cannot make assumptions on `UnknownVal`. Let us conjure a symbol // instead. if (RetVal.isUnknown()) { auto &SymMgr = C.getSymbolManager(); @@ -532,8 +532,9 @@ void IteratorModeling::handleRandomIncrOrDecr(CheckerContext &C, return; const auto *value = &RHS; + SVal val; if (auto loc = RHS.getAs<Loc>()) { - const auto val = State->getRawSVal(*loc); + val = State->getRawSVal(*loc); value = &val; } diff --git a/clang/test/Analysis/iterator-range.cpp b/clang/test/Analysis/iterator-range.cpp index bdfb04ba3a8c..ad8ce92ecfb8 100644 --- a/clang/test/Analysis/iterator-range.cpp +++ b/clang/test/Analysis/iterator-range.cpp @@ -810,6 +810,19 @@ void prev_0_end(const std::vector<int> &V) { auto j = std::prev(i, 0); // no-warning } +// std::prev() with int* for checking Loc value argument +namespace std { +template <typename T> +T prev(T, int *); +} + +void prev_loc_value(const std::vector<int> &V, int o) { + + auto i = return_any_iterator(V.begin()); + int *offset = &o; + auto j = std::prev(i, offset); // no-warning +} + // // Structure member dereference operators // _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
