Add the support for calling Ref::ptr accessor. #80919
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
clang
|
@llvm/pr-subscribers-clang Author: Ryosuke Niwa (rniwa) ChangesThis accessor returns a pointer from Ref type and is therefore safe. Full diff: https://github.com/llvm/llvm-project/pull/80919.diff 2 Files Affected:
diff --git a/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp b/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp
index c1f180f31338cb..4bc3f7a8c9c3ce 100644
--- a/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp
@@ -148,6 +148,7 @@ std::optional<bool> isGetterOfRefCounted(const CXXMethodDecl* M)
if (((className == "Ref" || className == "RefPtr") &&
methodName == "get") ||
+ (className == "Ref" && methodName == "ptr") ||
((className == "String" || className == "AtomString" ||
className == "AtomStringImpl" || className == "UniqueString" ||
className == "UniqueStringImpl" || className == "Identifier") &&
diff --git a/clang/test/Analysis/Checkers/WebKit/ref-ptr-accessor.cpp b/clang/test/Analysis/Checkers/WebKit/ref-ptr-accessor.cpp
new file mode 100644
index 00000000000000..d3185a9f2d58a4
--- /dev/null
+++ b/clang/test/Analysis/Checkers/WebKit/ref-ptr-accessor.cpp
@@ -0,0 +1,86 @@
+// RUN: %clang_analyze_cc1 -analyzer-checker=alpha.webkit.UncountedCallArgsChecker -verify %s
+// expected-no-diagnostics
+
+template<typename T>
+class Ref {
+public:
+ ~Ref()
+ {
+ if (auto* ptr = m_ptr)
+ ptr->deref();
+ m_ptr = nullptr;
+ }
+
+ Ref(T& object)
+ : m_ptr(&object)
+ {
+ object.ref();
+ }
+
+ Ref(const Ref& other)
+ : m_ptr(other.ptr())
+ {
+ m_ptr->ref();
+ }
+
+ template<typename X> Ref(const Ref<X>& other)
+ : m_ptr(other.ptr())
+ {
+ m_ptr->ref();
+ }
+
+ Ref(Ref&& other)
+ : m_ptr(&other.leakRef())
+ {
+ }
+
+ template<typename X>
+ Ref(Ref<X>&& other)
+ : m_ptr(&other.leakRef())
+ {
+ }
+
+ T* operator->() const { return m_ptr; }
+ T* ptr() const { return m_ptr; }
+ T& get() const { return *m_ptr; }
+ operator T&() const { return *m_ptr; }
+ bool operator!() const { return !*m_ptr; }
+
+ T& leakRef()
+ {
+ T& result = *m_ptr;
+ m_ptr = nullptr;
+ return result;
+ }
+
+private:
+ template<typename U> friend inline Ref<U> adoptRef(U&);
+
+ enum AdoptTag { Adopt };
+ Ref(T& object, AdoptTag)
+ : m_ptr(&object)
+ {
+ }
+
+ T* m_ptr;
+};
+
+class Node {
+public:
+ static Ref<Node> create();
+ virtual ~Node();
+
+ void ref() const;
+ void deref() const;
+
+protected:
+ explicit Node();
+};
+
+void someFunction(Node*);
+
+void testFunction()
+{
+ Ref node = Node::create();
+ someFunction(node.ptr());
+}
|
|
@llvm/pr-subscribers-clang-static-analyzer-1 Author: Ryosuke Niwa (rniwa) ChangesThis accessor returns a pointer from Ref type and is therefore safe. Full diff: https://github.com/llvm/llvm-project/pull/80919.diff 2 Files Affected:
diff --git a/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp b/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp
index c1f180f31338c..4bc3f7a8c9c3c 100644
--- a/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp
@@ -148,6 +148,7 @@ std::optional<bool> isGetterOfRefCounted(const CXXMethodDecl* M)
if (((className == "Ref" || className == "RefPtr") &&
methodName == "get") ||
+ (className == "Ref" && methodName == "ptr") ||
((className == "String" || className == "AtomString" ||
className == "AtomStringImpl" || className == "UniqueString" ||
className == "UniqueStringImpl" || className == "Identifier") &&
diff --git a/clang/test/Analysis/Checkers/WebKit/ref-ptr-accessor.cpp b/clang/test/Analysis/Checkers/WebKit/ref-ptr-accessor.cpp
new file mode 100644
index 0000000000000..d3185a9f2d58a
--- /dev/null
+++ b/clang/test/Analysis/Checkers/WebKit/ref-ptr-accessor.cpp
@@ -0,0 +1,86 @@
+// RUN: %clang_analyze_cc1 -analyzer-checker=alpha.webkit.UncountedCallArgsChecker -verify %s
+// expected-no-diagnostics
+
+template<typename T>
+class Ref {
+public:
+ ~Ref()
+ {
+ if (auto* ptr = m_ptr)
+ ptr->deref();
+ m_ptr = nullptr;
+ }
+
+ Ref(T& object)
+ : m_ptr(&object)
+ {
+ object.ref();
+ }
+
+ Ref(const Ref& other)
+ : m_ptr(other.ptr())
+ {
+ m_ptr->ref();
+ }
+
+ template<typename X> Ref(const Ref<X>& other)
+ : m_ptr(other.ptr())
+ {
+ m_ptr->ref();
+ }
+
+ Ref(Ref&& other)
+ : m_ptr(&other.leakRef())
+ {
+ }
+
+ template<typename X>
+ Ref(Ref<X>&& other)
+ : m_ptr(&other.leakRef())
+ {
+ }
+
+ T* operator->() const { return m_ptr; }
+ T* ptr() const { return m_ptr; }
+ T& get() const { return *m_ptr; }
+ operator T&() const { return *m_ptr; }
+ bool operator!() const { return !*m_ptr; }
+
+ T& leakRef()
+ {
+ T& result = *m_ptr;
+ m_ptr = nullptr;
+ return result;
+ }
+
+private:
+ template<typename U> friend inline Ref<U> adoptRef(U&);
+
+ enum AdoptTag { Adopt };
+ Ref(T& object, AdoptTag)
+ : m_ptr(&object)
+ {
+ }
+
+ T* m_ptr;
+};
+
+class Node {
+public:
+ static Ref<Node> create();
+ virtual ~Node();
+
+ void ref() const;
+ void deref() const;
+
+protected:
+ explicit Node();
+};
+
+void someFunction(Node*);
+
+void testFunction()
+{
+ Ref node = Node::create();
+ someFunction(node.ptr());
+}
|
rniwa
force-pushed
the
add-support-for-ptr-accessor
branch
from
63a64cf
to
b117f4c
Compare
haoNoQ
reviewed
Feb 9, 2024
rniwa
force-pushed
the
add-support-for-ptr-accessor
branch
from
b117f4c
to
26f2395
Compare
…ef::ptr accessor. This accessor returns a pointer from Ref type and is therefore safe.
rniwa
force-pushed
the
add-support-for-ptr-accessor
branch
from
26f2395
to
6476d4c
Compare
haoNoQ
approved these changes
Feb 9, 2024
haoNoQ
pushed a commit
to haoNoQ/llvm-project
that referenced
this pull request
Feb 13, 2024
This accessor returns a pointer from Ref type and is therefore safe. (cherry picked from commit 8256804)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This accessor returns a pointer from Ref type and is therefore safe.