diff --git a/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefLambdaCapturesChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefLambdaCapturesChecker.cpp index 27a91132fa9be..03eeb9999c4dd 100644 --- a/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefLambdaCapturesChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefLambdaCapturesChecker.cpp @@ -232,14 +232,11 @@ class RawPtrRefLambdaCapturesChecker if (!Init) return nullptr; if (auto *Lambda = dyn_cast(Init)) { + DeclRefExprsToIgnore.insert(DRE); updateIgnoreList(); return Lambda; } - TempExpr = dyn_cast(Init->IgnoreParenCasts()); - if (!TempExpr) - return nullptr; - updateIgnoreList(); - return dyn_cast_or_null(TempExpr->getSubExpr()); + return nullptr; } void checkCalleeLambda(CallExpr *CE) { diff --git a/clang/test/Analysis/Checkers/WebKit/uncounted-lambda-captures.cpp b/clang/test/Analysis/Checkers/WebKit/uncounted-lambda-captures.cpp index 3079f8e833fcd..0b8af0d1e8dc1 100644 --- a/clang/test/Analysis/Checkers/WebKit/uncounted-lambda-captures.cpp +++ b/clang/test/Analysis/Checkers/WebKit/uncounted-lambda-captures.cpp @@ -448,4 +448,27 @@ void ranges_for_each(RefCountable* obj) { obj->method(); ++(*static_cast(item)); }); -} \ No newline at end of file +} + +class RefCountedObj { +public: + void ref(); + void deref(); + + void call() const; + void callLambda([[clang::noescape]] const WTF::Function& callback) const; + void doSomeWork() const; +}; + +void RefCountedObj::callLambda([[clang::noescape]] const WTF::Function& callback) const +{ + callback(); +} + +void RefCountedObj::call() const +{ + auto lambda = [&] { + doSomeWork(); + }; + callLambda(lambda); +}