[-Wcompletion-handler] Don't recognize init methods as conventional

[vsavchenko]

Summary

rdar://75704162

[NoQ]

clang/lib/Analysis/CalledOnceCheck.cpp

1016

You can formally check whether it's an init method by querying its ObjCMethodFamily.

[vsavchenko]

Use builtin way of checking for init methods

[vsavchenko]

clang/lib/Analysis/CalledOnceCheck.cpp

1016

That's awesome, thanks!

[NoQ]

Looks great now!

clang/lib/Analysis/CalledOnceCheck.cpp

if (const SwiftAsyncAttr *A = D->getAttr<SwiftAsyncAttr>()) {
         return false;
       }
 
       return A->getCompletionHandlerIndex().getASTIndex() == ParamIndex;
     }
     return llvm::None;
   }
 
+  /// Return true if the specified selector represents init method.
+  static bool isInitMethod(Selector MethodSelector) {
+    return MethodSelector.getMethodFamily() == OMF_init;
+  }
+
   /// Return true if the specified selector piece matches conventions.
   static bool isConventionalSelectorPiece(Selector MethodSelector,
                                           unsigned PieceIndex,
                                           QualType PieceType) {
-    if (!isConventional(PieceType)) {
+    if (!isConventional(PieceType) || isInitMethod(MethodSelector)) {
       return false;
     }
 
     if (MethodSelector.getNumArgs() == 1) {
       assert(PieceIndex == 0);
       return hasConventionalSuffix(MethodSelector.getNameForSlot(0));
     }
 

clang/test/SemaObjC/warn-called-once.m

 // RUN: %clang_cc1 -verify -fsyntax-only -fblocks -fobjc-exceptions -Wcompletion-handler -Wno-pointer-to-int-cast %s
 
 #define NULL (void *)0
 #define nil (id)0
 #define CALLED_ONCE __attribute__((called_once))
 #define NORETURN __attribute__((noreturn))
 #define LIKELY(X) __builtin_expect(!!(X), 1)
 #define UNLIKELY(X) __builtin_expect(!!(X), 0)
 #define LIKELY_WITH_PROBA(X, P) __builtin_expect_with_probability(!!(X), 1, P)
 #define UNLIKELY_WITH_PROBA(X, P) __builtin_expect_with_probability(!!(X), 0, P)
 #define UNPRED(X) __builtin_unpredictable((long)(X))
 
 @protocol NSObject
 @end
 @interface NSObject <NSObject>
+- (instancetype)init;
 - (id)copy;
 - (id)class;
 - autorelease;
 @end
 
 typedef unsigned int NSUInteger;
 typedef struct {
 } NSFastEnumerationState;
- (void)test_cleanup_2:(int)cond
   } else {
     handler(); // expected-note{{previous call is here}}
   }
 
   // We still can warn about double call even in this case.
   handler(); // expected-warning{{completion handler is called twice}}
 }
 
+- (void)initWithAdditions:(int)cond
+           withCompletion:(void (^)(void))handler {
+  self = [self init];
+  if (self) {
+    escape(handler);
+  }
+  // no-warning
+}
+
 @end