[WebKit checkers] Treat ref() and incrementCheckedPtrCount() as trivial #115695
Conversation
This file contains hidden or 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
Treat member function calls to ref() and incrementCheckedPtrCount() as trivial so that a function which returns RefPtr/Ref out of a raw reference / pointer is also considered trivial.
llvmbot
added
clang
Member
|
@llvm/pr-subscribers-clang-static-analyzer-1 Author: Ryosuke Niwa (rniwa) ChangesTreat member function calls to ref() and incrementCheckedPtrCount() as trivial so that a function which returns RefPtr/Ref out of a raw reference / pointer is also considered trivial. Full diff: https://github.com/llvm/llvm-project/pull/115695.diff 3 Files Affected:
diff --git a/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp b/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp
index 31bebdb07dbdc2..08fce7e0fa564a 100644
--- a/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp
@@ -498,6 +498,10 @@ class TrivialFunctionAnalysisVisitor
if (!Callee)
return false;
+ auto Name = safeGetName(Callee);
+ if (Name == "ref" || Name == "incrementCheckedPtrCount")
+ return true;
+
std::optional<bool> IsGetterOfRefCounted = isGetterOfSafePtr(Callee);
if (IsGetterOfRefCounted && *IsGetterOfRefCounted)
return true;
diff --git a/clang/test/Analysis/Checkers/WebKit/call-args-checked-ptr.cpp b/clang/test/Analysis/Checkers/WebKit/call-args-checked-ptr.cpp
index 34ff0c70e230ea..072bceedcf9610 100644
--- a/clang/test/Analysis/Checkers/WebKit/call-args-checked-ptr.cpp
+++ b/clang/test/Analysis/Checkers/WebKit/call-args-checked-ptr.cpp
@@ -365,3 +365,22 @@ namespace call_with_explicit_temporary_obj {
CheckedPtr { provide() }->method();
}
}
+
+namespace call_with_checked_ptr {
+
+ class Foo : public CheckedObj {
+ public:
+ CheckedPtr<CheckedObj> obj1() { return m_obj; }
+ CheckedRef<CheckedObj> obj2() { return *m_obj; }
+ private:
+ CheckedObj* m_obj;
+ };
+
+ Foo* getFoo();
+
+ void bar() {
+ getFoo()->obj1()->method();
+ getFoo()->obj2()->method();
+ }
+
+}
diff --git a/clang/test/Analysis/Checkers/WebKit/uncounted-obj-arg.cpp b/clang/test/Analysis/Checkers/WebKit/uncounted-obj-arg.cpp
index e1dacdd9e25b6d..d654d963a4faef 100644
--- a/clang/test/Analysis/Checkers/WebKit/uncounted-obj-arg.cpp
+++ b/clang/test/Analysis/Checkers/WebKit/uncounted-obj-arg.cpp
@@ -366,6 +366,8 @@ class RefCounted {
void trivial65() {
__libcpp_verbose_abort("%s", "aborting");
}
+ RefPtr<RefCounted> trivial66() { return children[0]; }
+ Ref<RefCounted> trivial67() { return *children[0]; }
static RefCounted& singleton() {
static RefCounted s_RefCounted;
@@ -550,6 +552,8 @@ class UnrelatedClass {
getFieldTrivial().trivial63(); // no-warning
getFieldTrivial().trivial64(); // no-warning
getFieldTrivial().trivial65(); // no-warning
+ getFieldTrivial().trivial66()->trivial6(); // no-warning
+ getFieldTrivial().trivial67()->trivial6(); // no-warning
RefCounted::singleton().trivial18(); // no-warning
RefCounted::singleton().someFunction(); // no-warning
|
Member
|
@llvm/pr-subscribers-clang Author: Ryosuke Niwa (rniwa) ChangesTreat member function calls to ref() and incrementCheckedPtrCount() as trivial so that a function which returns RefPtr/Ref out of a raw reference / pointer is also considered trivial. Full diff: https://github.com/llvm/llvm-project/pull/115695.diff 3 Files Affected:
diff --git a/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp b/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp
index 31bebdb07dbdc2..08fce7e0fa564a 100644
--- a/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp
@@ -498,6 +498,10 @@ class TrivialFunctionAnalysisVisitor
if (!Callee)
return false;
+ auto Name = safeGetName(Callee);
+ if (Name == "ref" || Name == "incrementCheckedPtrCount")
+ return true;
+
std::optional<bool> IsGetterOfRefCounted = isGetterOfSafePtr(Callee);
if (IsGetterOfRefCounted && *IsGetterOfRefCounted)
return true;
diff --git a/clang/test/Analysis/Checkers/WebKit/call-args-checked-ptr.cpp b/clang/test/Analysis/Checkers/WebKit/call-args-checked-ptr.cpp
index 34ff0c70e230ea..072bceedcf9610 100644
--- a/clang/test/Analysis/Checkers/WebKit/call-args-checked-ptr.cpp
+++ b/clang/test/Analysis/Checkers/WebKit/call-args-checked-ptr.cpp
@@ -365,3 +365,22 @@ namespace call_with_explicit_temporary_obj {
CheckedPtr { provide() }->method();
}
}
+
+namespace call_with_checked_ptr {
+
+ class Foo : public CheckedObj {
+ public:
+ CheckedPtr<CheckedObj> obj1() { return m_obj; }
+ CheckedRef<CheckedObj> obj2() { return *m_obj; }
+ private:
+ CheckedObj* m_obj;
+ };
+
+ Foo* getFoo();
+
+ void bar() {
+ getFoo()->obj1()->method();
+ getFoo()->obj2()->method();
+ }
+
+}
diff --git a/clang/test/Analysis/Checkers/WebKit/uncounted-obj-arg.cpp b/clang/test/Analysis/Checkers/WebKit/uncounted-obj-arg.cpp
index e1dacdd9e25b6d..d654d963a4faef 100644
--- a/clang/test/Analysis/Checkers/WebKit/uncounted-obj-arg.cpp
+++ b/clang/test/Analysis/Checkers/WebKit/uncounted-obj-arg.cpp
@@ -366,6 +366,8 @@ class RefCounted {
void trivial65() {
__libcpp_verbose_abort("%s", "aborting");
}
+ RefPtr<RefCounted> trivial66() { return children[0]; }
+ Ref<RefCounted> trivial67() { return *children[0]; }
static RefCounted& singleton() {
static RefCounted s_RefCounted;
@@ -550,6 +552,8 @@ class UnrelatedClass {
getFieldTrivial().trivial63(); // no-warning
getFieldTrivial().trivial64(); // no-warning
getFieldTrivial().trivial65(); // no-warning
+ getFieldTrivial().trivial66()->trivial6(); // no-warning
+ getFieldTrivial().trivial67()->trivial6(); // no-warning
RefCounted::singleton().trivial18(); // no-warning
RefCounted::singleton().someFunction(); // no-warning
|
Contributor
Author
|
Thanks for the review! |
rniwa
added a commit
to rniwa/llvm-project
that referenced
this pull request
Feb 3, 2025
…al (llvm#115695) Treat member function calls to ref() and incrementCheckedPtrCount() as trivial so that a function which returns RefPtr/Ref out of a raw reference / pointer is also considered trivial.
devincoughlin
pushed a commit
to swiftlang/llvm-project
that referenced
this pull request
Feb 25, 2025
…al (llvm#115695) Treat member function calls to ref() and incrementCheckedPtrCount() as trivial so that a function which returns RefPtr/Ref out of a raw reference / pointer is also considered trivial.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Treat member function calls to ref() and incrementCheckedPtrCount() as trivial so that a function which returns RefPtr/Ref out of a raw reference / pointer is also considered trivial.