Merge commit '35aac306e778' from swift/release/5.5 into swift/main

Author: git apple-llvm automerger

clang/lib/Sema/SemaDeclAttr.cpp

@@ -3526,7 +3526,7 @@ static void handleFormatAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
   } else if (Kind == NSStringFormat) {
     // FIXME: do we need to check if the type is NSString*?  What are the
     // semantics?
-    if (!isNSStringType(Ty, S.Context)) {
+    if (!isNSStringType(Ty, S.Context, /*AllowNSAttributedString=*/true)) {
       S.Diag(AL.getLoc(), diag::err_format_attribute_not)
         << "an NSString" << IdxExpr->getSourceRange()
         << getFunctionOrMethodParamRange(D, ArgIdx);

clang/test/SemaObjC/format-strings-objc.m

@@ -34,6 +34,11 @@ @interface NSSimpleCString : NSString {} @end
 @interface NSConstantString : NSSimpleCString @end
 extern void *_NSConstantStringClassReference;
 
+@interface NSAttributedString : NSObject
++(instancetype)stringWithFormat:(NSAttributedString *)fmt, ...
+    __attribute__((format(__NSString__, 1, 2)));
+@end
+
 typedef const struct __CFString * CFStringRef;
 extern void CFStringCreateWithFormat(CFStringRef format, ...) __attribute__((format(CFString, 1, 2)));
 #define CFSTR(cStr)  ((CFStringRef) __builtin___CFStringMakeConstantString ("" cStr ""))
@@ -332,6 +337,9 @@ - (NSString *)someRandomMethod:(NSString *)key
                          value:(nullable NSString *)value
                          table:(nullable NSString *)tableName
     __attribute__((format_arg(1)));
+
+- (NSAttributedString *)someMethod2:(NSString *)key
+    __attribute__((format_arg(1)));
 @end
 
 void useLocalizedStringForKey(NSBundle *bndl) {
@@ -356,4 +364,9 @@ void useLocalizedStringForKey(NSBundle *bndl) {
               [bndl someRandomMethod:@"flerp"
                                value:0
                                table:0], 42]; // expected-warning{{data argument not used by format string}}
+
+  [NSAttributedString stringWithFormat:
+              [bndl someMethod2: @"test"], 5]; // expected-warning{{data argument not used by format string}}
+  [NSAttributedString stringWithFormat:
+              [bndl someMethod2: @"%f"], 42]; // expected-warning{{format specifies type 'double' but the argument has type 'int'}}
 }