Author: Ryosuke Niwa Date: 2024-09-17T22:23:27-07:00 New Revision: fd21b7911fbdddc80db2d3971ff10ee70a49b7e3
URL: https://github.com/llvm/llvm-project/commit/fd21b7911fbdddc80db2d3971ff10ee70a49b7e3 DIFF: https://github.com/llvm/llvm-project/commit/fd21b7911fbdddc80db2d3971ff10ee70a49b7e3.diff LOG: [webkit.RefCntblBaseVirtualDtor] ThreadSafeRefCounted still generates warnings (#108656) Improve the fix in 203a2ca8cd6af505e11a38aebceeaf864271042c by allowing variable references and more ignoring of parentheses. Added: Modified: clang/lib/StaticAnalyzer/Checkers/WebKit/RefCntblBaseVirtualDtorChecker.cpp clang/test/Analysis/Checkers/WebKit/ref-cntbl-crtp-base-no-virtual-dtor.cpp Removed: ################################################################################ diff --git a/clang/lib/StaticAnalyzer/Checkers/WebKit/RefCntblBaseVirtualDtorChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/WebKit/RefCntblBaseVirtualDtorChecker.cpp index ecba5f9aa23ee3..e80246f49a3100 100644 --- a/clang/lib/StaticAnalyzer/Checkers/WebKit/RefCntblBaseVirtualDtorChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/WebKit/RefCntblBaseVirtualDtorChecker.cpp @@ -72,7 +72,7 @@ class DerefFuncDeleteExprVisitor if (name == "ensureOnMainThread" || name == "ensureOnMainRunLoop") { for (unsigned i = 0; i < CE->getNumArgs(); ++i) { auto *Arg = CE->getArg(i); - if (VisitLabmdaArgument(Arg)) + if (VisitLambdaArgument(Arg)) return true; } } @@ -80,17 +80,24 @@ class DerefFuncDeleteExprVisitor return false; } - bool VisitLabmdaArgument(const Expr *E) { + bool VisitLambdaArgument(const Expr *E) { E = E->IgnoreParenCasts(); if (auto *TempE = dyn_cast<CXXBindTemporaryExpr>(E)) E = TempE->getSubExpr(); + E = E->IgnoreParenCasts(); + if (auto *Ref = dyn_cast<DeclRefExpr>(E)) { + if (auto *VD = dyn_cast_or_null<VarDecl>(Ref->getDecl())) + return VisitLambdaArgument(VD->getInit()); + return false; + } + if (auto *Lambda = dyn_cast<LambdaExpr>(E)) { + if (VisitBody(Lambda->getBody())) + return true; + } if (auto *ConstructE = dyn_cast<CXXConstructExpr>(E)) { for (unsigned i = 0; i < ConstructE->getNumArgs(); ++i) { - auto *Arg = ConstructE->getArg(i); - if (auto *Lambda = dyn_cast<LambdaExpr>(Arg)) { - if (VisitBody(Lambda->getBody())) - return true; - } + if (VisitLambdaArgument(ConstructE->getArg(i))) + return true; } } return false; diff --git a/clang/test/Analysis/Checkers/WebKit/ref-cntbl-crtp-base-no-virtual-dtor.cpp b/clang/test/Analysis/Checkers/WebKit/ref-cntbl-crtp-base-no-virtual-dtor.cpp index 01527addb52992..33c60ea8ca64d1 100644 --- a/clang/test/Analysis/Checkers/WebKit/ref-cntbl-crtp-base-no-virtual-dtor.cpp +++ b/clang/test/Analysis/Checkers/WebKit/ref-cntbl-crtp-base-no-virtual-dtor.cpp @@ -119,6 +119,11 @@ template<class T, DestructionThread destructionThread = DestructionThread::Any> ensureOnMainThread([this] { delete static_cast<const T*>(this); }); + } else if constexpr (destructionThread == DestructionThread::MainRunLoop) { + auto deleteThis = [this] { + delete static_cast<const T*>(this); + }; + ensureOnMainThread(deleteThis); } } @@ -230,3 +235,16 @@ class FancyRefCountedClass4 final : public BadNestedThreadSafeRefCounted<FancyRe private: FancyRefCountedClass4(); }; + +class FancyRefCountedClass5 final : public ThreadSafeRefCounted<FancyRefCountedClass5, DestructionThread::MainRunLoop> { +public: + static Ref<FancyRefCountedClass5> create() + { + return adoptRef(*new FancyRefCountedClass5()); + } + + virtual ~FancyRefCountedClass5(); + +private: + FancyRefCountedClass5(); +}; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
