[analyzer] [RetainCountChecker] Bugfix: in non-OSObject-mode, do not track CXX method calls

[NoQ]

clang/lib/Analysis/RetainSummaryManager.cpp

503 ↗

(On Diff #185392)

So if an OSObject-related method deals with NS or CF objects, we wouldn't escape it anymore?

I thing there might exist such code somewhere in between kernel and userland.

clang/test/Analysis/retain-release.mm

489 ↗

(On Diff #185392)

I enjoy namespacing my generic names, this way i can use generic names without being afraid to collide with someone else's code (cf. the test above).

lib/Analysis/RetainSummaryManager.cpp

RetainSummaryManager::generateSummary(const FunctionDecl *FD,
   // Inspect the result type. Strip away any typedefs.
   const auto *FT = FD->getType()->getAs<FunctionType>();
   QualType RetTy = FT->getReturnType();
 
   if (TrackOSObjects)
     if (const RetainSummary *S = getSummaryForOSObject(FD, FName, RetTy))
       return S;
 
-  if (TrackObjCAndCFObjects)
-    if (const RetainSummary *S =
-            getSummaryForObjCOrCFObject(FD, FName, RetTy, FT, AllowAnnotations))
-      return S;
-
   if (const auto *MD = dyn_cast<CXXMethodDecl>(FD))
-    if (!(TrackOSObjects && isOSObjectRelated(MD)))
+    if (!isOSObjectRelated(MD))
       return getPersistentSummary(RetEffect::MakeNoRet(),
                                   ArgEffects(AF.getEmptyMap()),
                                   ArgEffect(DoNothing),
                                   ArgEffect(StopTracking),
                                   ArgEffect(DoNothing));
 
+  if (TrackObjCAndCFObjects)
+    if (const RetainSummary *S =
+            getSummaryForObjCOrCFObject(FD, FName, RetTy, FT, AllowAnnotations))
+      return S;
+
   return getDefaultSummary();
 }
 
 const RetainSummary *
 RetainSummaryManager::getFunctionSummary(const FunctionDecl *FD) {
   // If we don't know what function we're calling, use our default summary.
   if (!FD)
     return getDefaultSummary();

test/Analysis/retain-release.mm

 
 // Do not assume that IOBSDNameMatching increments a reference counter,
 // unless return type is CFMutableDictionaryRef.
 void* IOBSDNameMatching();
 void rdar33832412() {
   void* x = IOBSDNameMatching(); // no-warning
 }
 
-
 namespace member_CFRetains {
 class Foo {
 public:
   void CFRetain(const Foo &) {}
   void CFRetain(int) {}
 };
 
 void bar() {
   Foo foo;
   foo.CFRetain(foo); // no-warning
   foo.CFRetain(0); // no-warning
 }
 }
+
+namespace cxx_method_escaping {
+
+struct S {
+  static CFArrayRef testGetNoTracking();
+  CFArrayRef testGetNoTrackingMember();
+};
+
+void test_cxx_static_method_escaping() {
+  CFArrayRef arr = S::testGetNoTracking();
+  CFRelease(arr);
+}
+
+void test_cxx_method_escaping(S *s) {
+  CFArrayRef arr = s->testGetNoTrackingMember();
+  CFRelease(arr);
+}
+
+}