Author: Ryosuke Niwa Date: 2024-09-11T12:03:23-07:00 New Revision: 882f21ec87abd960b7ce3e10225f2bfeda3e1f74
URL: https://github.com/llvm/llvm-project/commit/882f21ec87abd960b7ce3e10225f2bfeda3e1f74 DIFF: https://github.com/llvm/llvm-project/commit/882f21ec87abd960b7ce3e10225f2bfeda3e1f74.diff LOG: [WebKit Checkers] Allow "singleton" suffix to be camelCased. (#108257) We should allow singleton and fooSingleton as singleton function names. Added: Modified: clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp clang/test/Analysis/Checkers/WebKit/uncounted-obj-arg.cpp Removed: ################################################################################ diff --git a/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp b/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp index 2b9b7883c978ba..42efc0c43766e9 100644 --- a/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp @@ -231,11 +231,9 @@ bool isSingleton(const FunctionDecl *F) { if (!MethodDecl->isStatic()) return false; } - const auto &Name = safeGetName(F); - std::string SingletonStr = "singleton"; - auto index = Name.find(SingletonStr); - return index != std::string::npos && - index == Name.size() - SingletonStr.size(); + const auto &NameStr = safeGetName(F); + StringRef Name = NameStr; // FIXME: Make safeGetName return StringRef. + return Name == "singleton" || Name.ends_with("Singleton"); } // We only care about statements so let's use the simple diff --git a/clang/test/Analysis/Checkers/WebKit/uncounted-obj-arg.cpp b/clang/test/Analysis/Checkers/WebKit/uncounted-obj-arg.cpp index 424ebd349e955a..97efb354f0371d 100644 --- a/clang/test/Analysis/Checkers/WebKit/uncounted-obj-arg.cpp +++ b/clang/test/Analysis/Checkers/WebKit/uncounted-obj-arg.cpp @@ -343,6 +343,12 @@ class RefCounted { return s_RefCounted; } + static RefCounted& otherSingleton() { + static RefCounted s_RefCounted; + s_RefCounted.ref(); + return s_RefCounted; + } + Number nonTrivial1() { return Number(3) + Number(4); } Number nonTrivial2() { return Number { 0.3 }; } int nonTrivial3() { return v ? otherFunction() : 0; } @@ -512,6 +518,8 @@ class UnrelatedClass { RefCounted::singleton().trivial18(); // no-warning RefCounted::singleton().someFunction(); // no-warning + RefCounted::otherSingleton().trivial18(); // no-warning + RefCounted::otherSingleton().someFunction(); // no-warning getFieldTrivial().recursiveTrivialFunction(7); // no-warning getFieldTrivial().recursiveComplexFunction(9); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
