Author: Balázs Kéri Date: 2020-07-23T11:53:25+02:00 New Revision: 65fd651980a8ad965363807cc334c513e4c8ffe4
URL: https://github.com/llvm/llvm-project/commit/65fd651980a8ad965363807cc334c513e4c8ffe4 DIFF: https://github.com/llvm/llvm-project/commit/65fd651980a8ad965363807cc334c513e4c8ffe4.diff LOG: [Analyzer][StreamChecker] Use BugType::SuppressOnSink at resource leak report. Summary: Use the built-in functionality BugType::SuppressOnSink instead of a manual solution in StreamChecker. Differential Revision: https://reviews.llvm.org/D83120 Added: Modified: clang/lib/StaticAnalyzer/Checkers/StreamChecker.cpp clang/test/Analysis/stream.c Removed: ################################################################################ diff --git a/clang/lib/StaticAnalyzer/Checkers/StreamChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/StreamChecker.cpp index 1e963249156f..6b176b3c4e2b 100644 --- a/clang/lib/StaticAnalyzer/Checkers/StreamChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/StreamChecker.cpp @@ -204,7 +204,8 @@ class StreamChecker : public Checker<check::PreCall, eval::Call, BugType BT_IllegalWhence{this, "Illegal whence argument", "Stream handling error"}; BugType BT_StreamEof{this, "Stream already in EOF", "Stream handling error"}; - BugType BT_ResourceLeak{this, "Resource leak", "Stream handling error"}; + BugType BT_ResourceLeak{this, "Resource leak", "Stream handling error", + /*SuppressOnSink =*/true}; public: void checkPreCall(const CallEvent &Call, CheckerContext &C) const; @@ -965,11 +966,6 @@ void StreamChecker::reportFEofWarning(CheckerContext &C, ExplodedNode * StreamChecker::reportLeaks(const SmallVector<SymbolRef, 2> &LeakedSyms, CheckerContext &C, ExplodedNode *Pred) const { - // Do not warn for non-closed stream at program exit. - // FIXME: Use BugType::SuppressOnSink instead. - if (Pred && Pred->getCFGBlock() && Pred->getCFGBlock()->hasNoReturnElement()) - return Pred; - ExplodedNode *Err = C.generateNonFatalErrorNode(C.getState(), Pred); if (!Err) return Pred; diff --git a/clang/test/Analysis/stream.c b/clang/test/Analysis/stream.c index cd5d28ae8455..c57f3159fcc7 100644 --- a/clang/test/Analysis/stream.c +++ b/clang/test/Analysis/stream.c @@ -261,7 +261,9 @@ void check_leak_noreturn_2() { if (!F1) return; if (Test == 1) { - return; // expected-warning {{Opened stream never closed. Potential resource leak}} + return; // no warning } rewind(F1); -} // no warning +} // expected-warning {{Opened stream never closed. Potential resource leak}} +// FIXME: This warning should be placed at the `return` above. +// See https://reviews.llvm.org/D83120 about details. _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
