llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang-static-analyzer-1 Author: Ryosuke Niwa (rniwa) <details> <summary>Changes</summary> This PR fixes the bug that we weren't generating warnings when a raw poiner is used to point to a NS type in Objective-C ivars. Also fix the bug that we weren't suppressing this warning in system headers. --- Full diff: https://github.com/llvm/llvm-project/pull/132833.diff 3 Files Affected: - (modified) clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefMemberChecker.cpp (+10) - (modified) clang/test/Analysis/Checkers/WebKit/mock-system-header.h (+11) - (modified) clang/test/Analysis/Checkers/WebKit/unretained-members.mm (+11-1) ``````````diff diff --git a/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefMemberChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefMemberChecker.cpp index dc4e2c7d168fb..6d20869043358 100644 --- a/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefMemberChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/WebKit/RawPtrRefMemberChecker.cpp @@ -111,6 +111,8 @@ class RawPtrRefMemberChecker } void visitObjCDecl(const ObjCContainerDecl *CD) const { + if (BR->getSourceManager().isInSystemHeader(CD->getLocation())) + return; if (auto *ID = dyn_cast<ObjCInterfaceDecl>(CD)) { for (auto *Ivar : ID->ivars()) visitIvarDecl(CD, Ivar); @@ -133,6 +135,14 @@ class RawPtrRefMemberChecker std::optional<bool> IsCompatible = isPtrCompatible(QT, IvarCXXRD); if (IsCompatible && *IsCompatible) reportBug(Ivar, IvarType, IvarCXXRD, CD); + } else { + std::optional<bool> IsCompatible = isPtrCompatible(QT, nullptr); + auto *PointeeType = IvarType->getPointeeType().getTypePtrOrNull(); + if (IsCompatible && *IsCompatible) { + auto *Desugared = PointeeType->getUnqualifiedDesugaredType(); + if (auto *ObjCType = dyn_cast_or_null<ObjCInterfaceType>(Desugared)) + reportBug(Ivar, IvarType, ObjCType->getDecl(), CD); + } } } diff --git a/clang/test/Analysis/Checkers/WebKit/mock-system-header.h b/clang/test/Analysis/Checkers/WebKit/mock-system-header.h index e993fd697ffab..b377f5098c002 100644 --- a/clang/test/Analysis/Checkers/WebKit/mock-system-header.h +++ b/clang/test/Analysis/Checkers/WebKit/mock-system-header.h @@ -29,3 +29,14 @@ enum os_log_type_t : uint8_t { typedef struct os_log_s *os_log_t; os_log_t os_log_create(const char *subsystem, const char *category); void os_log_msg(os_log_t oslog, os_log_type_t type, const char *msg, ...); + +typedef const struct __attribute__((objc_bridge(NSString))) __CFString * CFStringRef; + +#ifdef __OBJC__ +@class NSString; +@interface SystemObject : NSObject { + NSString *ns_string; + CFStringRef cf_string; +} +@end +#endif diff --git a/clang/test/Analysis/Checkers/WebKit/unretained-members.mm b/clang/test/Analysis/Checkers/WebKit/unretained-members.mm index e068a583c18c5..79f7a05caa1be 100644 --- a/clang/test/Analysis/Checkers/WebKit/unretained-members.mm +++ b/clang/test/Analysis/Checkers/WebKit/unretained-members.mm @@ -1,7 +1,8 @@ // RUN: %clang_analyze_cc1 -analyzer-checker=alpha.webkit.NoUnretainedMemberChecker -verify %s #include "objc-mock-types.h" - +#include "mock-system-header.h" +#if 0 namespace members { struct Foo { @@ -58,3 +59,12 @@ void forceTmplToInstantiate(FooTmpl<SomeObj, CFMutableArrayRef>) {} void forceTmplToInstantiate(RefPtr<SomeObj>) {} } +#endif + +@interface AnotherObject : NSObject { + NSString *ns_string; + // expected-warning@-1{{Instance variable 'ns_string' in 'AnotherObject' is a raw pointer to retainable type 'NSString'; member variables must be a RetainPtr}} + CFStringRef cf_string; + // expected-warning@-1{{Instance variable 'cf_string' in 'AnotherObject' is a retainable type 'CFStringRef'; member variables must be a RetainPtr}} +} +@end `````````` </details> https://github.com/llvm/llvm-project/pull/132833 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
