https://github.com/rniwa created
https://github.com/llvm/llvm-project/pull/135532
WebKit uses #define to rename RetainPtr to RetainPtrArc so add the support for
it.
>From efd914e66352fdf7e9fac3355d0a06159e880987 Mon Sep 17 00:00:00 2001
From: Ryosuke Niwa <rn...@webkit.org>
Date: Sun, 13 Apr 2025 01:30:26 -0700
Subject: [PATCH] [alpha.webkit.UnretainedCallArgsChecker] Add the support for
RetainPtrArc
WebKit uses #define to rename RetainPtr to RetainPtrArc so add the support for
it.
---
.../Checkers/WebKit/PtrTypesSemantics.cpp | 17 +++++++++++------
.../Analysis/Checkers/WebKit/objc-mock-types.h | 5 +++++
.../Checkers/WebKit/unretained-call-args-arc.mm | 11 +++++++++++
.../Checkers/WebKit/unretained-call-args.mm | 11 +++++++++++
4 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp
b/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp
index 781b0de5abd2f..4971b2c6a1190 100644
--- a/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/WebKit/PtrTypesSemantics.cpp
@@ -119,7 +119,9 @@ bool isRefType(const std::string &Name) {
Name == "RefPtr" || Name == "RefPtrAllowingPartiallyDestroyed";
}
-bool isRetainPtr(const std::string &Name) { return Name == "RetainPtr"; }
+bool isRetainPtr(const std::string &Name) {
+ return Name == "RetainPtr" || Name == "RetainPtrArc";
+}
bool isCheckedPtr(const std::string &Name) {
return Name == "CheckedPtr" || Name == "CheckedRef";
@@ -157,7 +159,8 @@ bool isCtorOfCheckedPtr(const clang::FunctionDecl *F) {
bool isCtorOfRetainPtr(const clang::FunctionDecl *F) {
const std::string &FunctionName = safeGetName(F);
return FunctionName == "RetainPtr" || FunctionName == "adoptNS" ||
- FunctionName == "adoptCF" || FunctionName == "retainPtr";
+ FunctionName == "adoptCF" || FunctionName == "retainPtr" ||
+ FunctionName == "RetainPtrArc" || FunctionName == "adoptNSArc";
}
bool isCtorOfSafePtr(const clang::FunctionDecl *F) {
@@ -190,7 +193,9 @@ bool isRefOrCheckedPtrType(const clang::QualType T) {
}
bool isRetainPtrType(const clang::QualType T) {
- return isPtrOfType(T, [](auto Name) { return Name == "RetainPtr"; });
+ return isPtrOfType(T, [](auto Name) {
+ return Name == "RetainPtr" || Name == "RetainPtrArc";
+ });
}
bool isOwnerPtrType(const clang::QualType T) {
@@ -374,7 +379,7 @@ std::optional<bool> isGetterOfSafePtr(const CXXMethodDecl
*M) {
method == "impl"))
return true;
- if (className == "RetainPtr" && method == "get")
+ if (isRetainPtr(className) && method == "get")
return true;
// Ref<T> -> T conversion
@@ -395,7 +400,7 @@ std::optional<bool> isGetterOfSafePtr(const CXXMethodDecl
*M) {
}
}
- if (className == "RetainPtr") {
+ if (isRetainPtr(className)) {
if (auto *maybeRefToRawOperator = dyn_cast<CXXConversionDecl>(M)) {
auto QT = maybeRefToRawOperator->getConversionType();
auto *T = QT.getTypePtrOrNull();
@@ -429,7 +434,7 @@ bool isCheckedPtr(const CXXRecordDecl *R) {
bool isRetainPtr(const CXXRecordDecl *R) {
assert(R);
if (auto *TmplR = R->getTemplateInstantiationPattern())
- return safeGetName(TmplR) == "RetainPtr";
+ return isRetainPtr(safeGetName(TmplR));
return false;
}
diff --git a/clang/test/Analysis/Checkers/WebKit/objc-mock-types.h
b/clang/test/Analysis/Checkers/WebKit/objc-mock-types.h
index 3f075ca0a6e5b..76d3d187368ae 100644
--- a/clang/test/Analysis/Checkers/WebKit/objc-mock-types.h
+++ b/clang/test/Analysis/Checkers/WebKit/objc-mock-types.h
@@ -17,6 +17,7 @@ typedef const struct CF_BRIDGED_TYPE(NSString) __CFString *
CFStringRef;
typedef const struct CF_BRIDGED_TYPE(NSArray) __CFArray * CFArrayRef;
typedef struct CF_BRIDGED_MUTABLE_TYPE(NSMutableArray) __CFArray *
CFMutableArrayRef;
typedef struct CF_BRIDGED_MUTABLE_TYPE(CFRunLoopRef) __CFRunLoop *
CFRunLoopRef;
+typedef struct CF_BRIDGED_TYPE(id) CGImage *CGImageRef;
#define NS_RETURNS_RETAINED __attribute__((ns_returns_retained))
#define CF_CONSUMED __attribute__((cf_consumed))
@@ -150,6 +151,10 @@ namespace WTF {
void WTFCrash(void);
+#if __has_feature(objc_arc)
+#define RetainPtr RetainPtrArc
+#endif
+
template<typename T> class RetainPtr;
template<typename T> RetainPtr<T> adoptNS(T*);
template<typename T> RetainPtr<T> adoptCF(T);
diff --git a/clang/test/Analysis/Checkers/WebKit/unretained-call-args-arc.mm
b/clang/test/Analysis/Checkers/WebKit/unretained-call-args-arc.mm
index f1f4d912663aa..4207c1836079f 100644
--- a/clang/test/Analysis/Checkers/WebKit/unretained-call-args-arc.mm
+++ b/clang/test/Analysis/Checkers/WebKit/unretained-call-args-arc.mm
@@ -5,6 +5,8 @@
SomeObj *provide();
CFMutableArrayRef provide_cf();
void someFunction();
+CGImageRef provideImage();
+NSString *stringForImage(CGImageRef);
namespace raw_ptr {
@@ -36,4 +38,13 @@ - (SomeObj *)getSomeObj {
- (void)doWorkOnSomeObj {
[[self getSomeObj] doWork];
}
+
+- (CGImageRef)createImage {
+ return provideImage();
+}
+
+- (NSString *)convertImage {
+ RetainPtr<CGImageRef> image = [self createImage];
+ return stringForImage(image.get());
+}
@end
diff --git a/clang/test/Analysis/Checkers/WebKit/unretained-call-args.mm
b/clang/test/Analysis/Checkers/WebKit/unretained-call-args.mm
index dd21864300387..e63af08c21205 100644
--- a/clang/test/Analysis/Checkers/WebKit/unretained-call-args.mm
+++ b/clang/test/Analysis/Checkers/WebKit/unretained-call-args.mm
@@ -9,6 +9,9 @@
CFMutableArrayRef provide_cf();
void consume_cf(CFMutableArrayRef);
+CGImageRef provideImage();
+NSString *stringForImage(CGImageRef);
+
void some_function();
namespace simple {
@@ -430,4 +433,12 @@ - (void)doWorkOnSomeObj {
[[self getSomeObj] doWork];
}
+- (CGImageRef)createImage {
+ return provideImage();
+}
+
+- (NSString *)convertImage {
+ RetainPtr<CGImageRef> image = [self createImage];
+ return stringForImage(image.get());
+}
@end
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
