https://github.com/rniwa updated https://github.com/llvm/llvm-project/pull/80810
>From e179bbef69084caac3948977a7091332c69130f5 Mon Sep 17 00:00:00 2001
From: Ryosuke Niwa <rn...@webkit.org>
Date: Tue, 6 Feb 2024 01:13:34 -0800
Subject: [PATCH 1/2] Ignore assignment to Ref / RefPtr in
alpha.webkit.UncountedCallArgsChecker.
---
.../WebKit/UncountedCallArgsChecker.cpp | 10 +++
.../Checkers/WebKit/assignment-to-refptr.cpp | 71 +++++++++++++++++++
2 files changed, 81 insertions(+)
create mode 100644 clang/test/Analysis/Checkers/WebKit/assignment-to-refptr.cpp
diff --git
a/clang/lib/StaticAnalyzer/Checkers/WebKit/UncountedCallArgsChecker.cpp
b/clang/lib/StaticAnalyzer/Checkers/WebKit/UncountedCallArgsChecker.cpp
index 407b6ba7a76428..419140bf12b66c 100644
--- a/clang/lib/StaticAnalyzer/Checkers/WebKit/UncountedCallArgsChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/WebKit/UncountedCallArgsChecker.cpp
@@ -126,6 +126,16 @@ class UncountedCallArgsChecker
// of object on LHS.
if (auto *MemberOp = dyn_cast<CXXOperatorCallExpr>(CE)) {
// Note: assignemnt to built-in type isn't derived from CallExpr.
+ if (MemberOp->getOperator() ==
+ OO_Equal) { // Ignore assignment to Ref/RefPtr.
+ auto *callee = MemberOp->getDirectCallee();
+ if (auto *calleeDecl = dyn_cast<CXXMethodDecl>(callee)) {
+ if (const CXXRecordDecl *classDecl = calleeDecl->getParent()) {
+ if (isRefCounted(classDecl))
+ return true;
+ }
+ }
+ }
if (MemberOp->isAssignmentOp())
return false;
}
diff --git a/clang/test/Analysis/Checkers/WebKit/assignment-to-refptr.cpp
b/clang/test/Analysis/Checkers/WebKit/assignment-to-refptr.cpp
new file mode 100644
index 00000000000000..c8ad634a5493f5
--- /dev/null
+++ b/clang/test/Analysis/Checkers/WebKit/assignment-to-refptr.cpp
@@ -0,0 +1,71 @@
+// RUN: %clang_analyze_cc1
-analyzer-checker=alpha.webkit.UncountedCallArgsChecker -verify %s
+// expected-no-diagnostics
+
+template<typename T>
+class RefPtr {
+public:
+ inline constexpr RefPtr() : m_ptr(nullptr) { }
+ inline RefPtr(T* ptr)
+ : m_ptr(ptr)
+ {
+ if (m_ptr)
+ m_ptr->ref();
+ }
+
+ inline RefPtr(const RefPtr& o)
+ : m_ptr(o.m_ptr)
+ {
+ if (m_ptr)
+ m_ptr->ref();
+ }
+
+ inline ~RefPtr()
+ {
+ if (m_ptr)
+ m_ptr->deref();
+ }
+
+ inline T* operator->() const { return m_ptr; }
+ explicit operator bool() const { return m_ptr; }
+
+ RefPtr& operator=(const RefPtr&);
+ RefPtr& operator=(T*);
+
+private:
+ T* m_ptr;
+};
+
+template<typename T>
+inline RefPtr<T>& RefPtr<T>::operator=(const RefPtr& o)
+{
+ if (m_ptr)
+ m_ptr->deref();
+ m_ptr = o.m_ptr;
+ if (m_ptr)
+ m_ptr->ref();
+ return *this;
+}
+
+template<typename T>
+inline RefPtr<T>& RefPtr<T>::operator=(T* optr)
+{
+ if (m_ptr)
+ m_ptr->deref();
+ m_ptr = optr;
+ if (m_ptr)
+ m_ptr->ref();
+ return *this;
+}
+
+class Node {
+public:
+ Node* nextSibling() const;
+
+ void ref() const;
+ void deref() const;
+};
+
+static void removeDetachedChildren(Node* firstChild)
+{
+ for (RefPtr child = firstChild; child; child = child->nextSibling());
+}
>From 6eded7d9da598f15647cb25fc6ac023b27d16132 Mon Sep 17 00:00:00 2001
From: Ryosuke Niwa <rn...@webkit.org>
Date: Fri, 9 Feb 2024 15:17:23 -0800
Subject: [PATCH 2/2] Use mock-types.h instead of embedding RefPtr definiton in
the test.
---
.../Checkers/WebKit/assignment-to-refptr.cpp | 56 +------------------
.../Analysis/Checkers/WebKit/mock-types.h | 1 +
2 files changed, 2 insertions(+), 55 deletions(-)
diff --git a/clang/test/Analysis/Checkers/WebKit/assignment-to-refptr.cpp
b/clang/test/Analysis/Checkers/WebKit/assignment-to-refptr.cpp
index c8ad634a5493f5..8b2b4671ed96b1 100644
--- a/clang/test/Analysis/Checkers/WebKit/assignment-to-refptr.cpp
+++ b/clang/test/Analysis/Checkers/WebKit/assignment-to-refptr.cpp
@@ -1,61 +1,7 @@
// RUN: %clang_analyze_cc1
-analyzer-checker=alpha.webkit.UncountedCallArgsChecker -verify %s
// expected-no-diagnostics
-template<typename T>
-class RefPtr {
-public:
- inline constexpr RefPtr() : m_ptr(nullptr) { }
- inline RefPtr(T* ptr)
- : m_ptr(ptr)
- {
- if (m_ptr)
- m_ptr->ref();
- }
-
- inline RefPtr(const RefPtr& o)
- : m_ptr(o.m_ptr)
- {
- if (m_ptr)
- m_ptr->ref();
- }
-
- inline ~RefPtr()
- {
- if (m_ptr)
- m_ptr->deref();
- }
-
- inline T* operator->() const { return m_ptr; }
- explicit operator bool() const { return m_ptr; }
-
- RefPtr& operator=(const RefPtr&);
- RefPtr& operator=(T*);
-
-private:
- T* m_ptr;
-};
-
-template<typename T>
-inline RefPtr<T>& RefPtr<T>::operator=(const RefPtr& o)
-{
- if (m_ptr)
- m_ptr->deref();
- m_ptr = o.m_ptr;
- if (m_ptr)
- m_ptr->ref();
- return *this;
-}
-
-template<typename T>
-inline RefPtr<T>& RefPtr<T>::operator=(T* optr)
-{
- if (m_ptr)
- m_ptr->deref();
- m_ptr = optr;
- if (m_ptr)
- m_ptr->ref();
- return *this;
-}
+#include "mock-types.h"
class Node {
public:
diff --git a/clang/test/Analysis/Checkers/WebKit/mock-types.h
b/clang/test/Analysis/Checkers/WebKit/mock-types.h
index 5f570b8bee8cb8..814e0944145992 100644
--- a/clang/test/Analysis/Checkers/WebKit/mock-types.h
+++ b/clang/test/Analysis/Checkers/WebKit/mock-types.h
@@ -20,6 +20,7 @@ template <typename T> struct RefPtr {
T *operator->() { return t; }
T &operator*() { return *t; }
RefPtr &operator=(T *) { return *this; }
+ operator bool() { return t; }
};
template <typename T> bool operator==(const RefPtr<T> &, const RefPtr<T> &) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
