https://github.com/rniwa updated https://github.com/llvm/llvm-project/pull/127182
>From 2be47498ca7597748ee8b29f5d39d74608c2f4d3 Mon Sep 17 00:00:00 2001 From: Ryosuke Niwa <rn...@webkit.org> Date: Fri, 14 Feb 2025 00:48:36 -0800 Subject: [PATCH 1/3] [alpha.webkit.UncountedCallArgsChecker] Allow ArrayInitLoopExpr and OpaqueValueExpr in trivial expressions Allow VisitArrayInitLoopExpr, VisitArrayInitIndexExpr, and VisitOpaqueValueExpr in trivial functions and statements. --- .../Checkers/WebKit/PtrTypesSemantics.cpp | 12 +++++ .../call-args-loop-init-opaque-value.cpp | 47 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 clang/test/Analysis/Checkers/WebKit/call-args-loop-init-opaque-value.cpp diff --git a/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp b/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp index d40b4b4dbb560..edfe72c62b2c8 100644 --- a/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp @@ -589,6 +589,18 @@ class TrivialFunctionAnalysisVisitor return Visit(BTE->getSubExpr()); } + bool VisitArrayInitLoopExpr(const ArrayInitLoopExpr *AILE) { + return Visit(AILE->getCommonExpr()) && Visit(AILE->getSubExpr()); + } + + bool VisitArrayInitIndexExpr(const ArrayInitIndexExpr *AIIE) { + return true; // The current array index in VisitArrayInitLoopExpr is always trivial. + } + + bool VisitOpaqueValueExpr(const OpaqueValueExpr *OVE) { + return Visit(OVE->getSourceExpr()); + } + bool VisitExprWithCleanups(const ExprWithCleanups *EWC) { return Visit(EWC->getSubExpr()); } diff --git a/clang/test/Analysis/Checkers/WebKit/call-args-loop-init-opaque-value.cpp b/clang/test/Analysis/Checkers/WebKit/call-args-loop-init-opaque-value.cpp new file mode 100644 index 0000000000000..69987c600eeb5 --- /dev/null +++ b/clang/test/Analysis/Checkers/WebKit/call-args-loop-init-opaque-value.cpp @@ -0,0 +1,47 @@ +// RUN: %clang_analyze_cc1 -analyzer-checker=alpha.webkit.UncountedCallArgsChecker -verify %s +// expected-no-diagnostics + +typedef unsigned long size_t; +template<typename T, size_t N> +struct Obj { + constexpr static size_t Size = N; + + constexpr T& operator[](size_t i) { return components[i]; } + constexpr const T& operator[](size_t i) const { return components[i]; } + + constexpr size_t size() const { return Size; } + + T components[N]; +}; + +template<typename T, size_t N> +constexpr bool operator==(const Obj<T, N>& a, const Obj<T, N>& b) +{ + for (size_t i = 0; i < N; ++i) { + if (a[i] == b[i]) + continue; + return false; + } + + return true; +} + +class Component { +public: + void ref() const; + void deref() const; + + Obj<float, 4> unresolvedComponents() const { return m_components; } + + bool isEqual(const Component& other) const { + return unresolvedComponents() == other.unresolvedComponents(); + } + +private: + Obj<float, 4> m_components; +}; + +Component* provide(); +bool someFunction(Component* other) { + return provide()->isEqual(*other); +} >From e49246b2c9e73a2b7cdd128f7c9afc02c433a01b Mon Sep 17 00:00:00 2001 From: Ryosuke Niwa <rn...@webkit.org> Date: Fri, 14 Feb 2025 10:09:30 -0800 Subject: [PATCH 2/3] Fix formatting --- clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp b/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp index edfe72c62b2c8..0f0aaa0e1902b 100644 --- a/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp @@ -594,7 +594,8 @@ class TrivialFunctionAnalysisVisitor } bool VisitArrayInitIndexExpr(const ArrayInitIndexExpr *AIIE) { - return true; // The current array index in VisitArrayInitLoopExpr is always trivial. + return true; // The current array index in VisitArrayInitLoopExpr is always + // trivial. } bool VisitOpaqueValueExpr(const OpaqueValueExpr *OVE) { >From d5b04c9a468f33b1499956d3cad17bbca2d2450a Mon Sep 17 00:00:00 2001 From: Ryosuke Niwa <rn...@webkit.org> Date: Fri, 14 Feb 2025 13:58:19 -0800 Subject: [PATCH 3/3] Add a non-trivial test case --- .../call-args-loop-init-opaque-value.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/clang/test/Analysis/Checkers/WebKit/call-args-loop-init-opaque-value.cpp b/clang/test/Analysis/Checkers/WebKit/call-args-loop-init-opaque-value.cpp index 69987c600eeb5..8fa10306c20f3 100644 --- a/clang/test/Analysis/Checkers/WebKit/call-args-loop-init-opaque-value.cpp +++ b/clang/test/Analysis/Checkers/WebKit/call-args-loop-init-opaque-value.cpp @@ -1,5 +1,4 @@ // RUN: %clang_analyze_cc1 -analyzer-checker=alpha.webkit.UncountedCallArgsChecker -verify %s -// expected-no-diagnostics typedef unsigned long size_t; template<typename T, size_t N> @@ -26,22 +25,40 @@ constexpr bool operator==(const Obj<T, N>& a, const Obj<T, N>& b) return true; } +struct NonTrivial { + NonTrivial(); + NonTrivial(const NonTrivial&); + bool operator==(const NonTrivial& other) const { return value == other.value; } + float value; +}; + class Component { public: void ref() const; void deref() const; Obj<float, 4> unresolvedComponents() const { return m_components; } + Obj<NonTrivial, 4> unresolvedNonTrivialComponents() const { return m_nonTrivialComponents; } bool isEqual(const Component& other) const { return unresolvedComponents() == other.unresolvedComponents(); } + bool isNonTrivialEqual(const Component& other) const { + return unresolvedNonTrivialComponents() == other.unresolvedNonTrivialComponents(); + } + private: Obj<float, 4> m_components; + Obj<NonTrivial, 4> m_nonTrivialComponents; }; Component* provide(); bool someFunction(Component* other) { return provide()->isEqual(*other); } + +bool otherFunction(Component* other) { + return provide()->isNonTrivialEqual(*other); + // expected-warning@-1{{Call argument for 'this' parameter is uncounted and unsafe}} +} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits