Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

lib/ClangImporter/ImportType.cpp

@@ -953,27 +953,32 @@ namespace {
             return {};
           }
           if (nsObjectTy && importedType->isEqual(nsObjectTy)) {
-            SmallVector<clang::ObjCProtocolDecl *, 4> protocols{
-              type->qual_begin(), type->qual_end()
-            };
-            auto *nsObjectProto =
-                Impl.getNSObjectProtocolType()->getAnyNominal();
-            if (!nsObjectProto) {
-              // Input is malformed
-              return {};
+            // Skip if there is no NSObject protocol.
+            auto nsObjectProtoType =
+                Impl.getNSObjectProtocolType();
+            if (nsObjectProtoType) {
+              auto *nsObjectProto = nsObjectProtoType->getAnyNominal();
+              if (!nsObjectProto) {
+                // Input is malformed
+                return {};
+              }
+
+              SmallVector<clang::ObjCProtocolDecl *, 4> protocols{
+                type->qual_begin(), type->qual_end()
+              };
+              auto *clangProto =
+                  cast<clang::ObjCProtocolDecl>(nsObjectProto->getClangDecl());
+              protocols.push_back(
+                  const_cast<clang::ObjCProtocolDecl *>(clangProto));
+
+              clang::ASTContext &clangCtx = Impl.getClangASTContext();
+              clang::QualType protosOnlyType =
+                  clangCtx.getObjCObjectType(clangCtx.ObjCBuiltinIdTy,
+                                             /*type args*/{},
+                                             protocols,
+                                             /*kindof*/false);
+              return Visit(clangCtx.getObjCObjectPointerType(protosOnlyType));
             }
-            auto *clangProto =
-                cast<clang::ObjCProtocolDecl>(nsObjectProto->getClangDecl());
-            protocols.push_back(
-                const_cast<clang::ObjCProtocolDecl *>(clangProto));
-
-            clang::ASTContext &clangCtx = Impl.getClangASTContext();
-            clang::QualType protosOnlyType =
-                clangCtx.getObjCObjectType(clangCtx.ObjCBuiltinIdTy,
-                                           /*type args*/{},
-                                           protocols,
-                                           /*kindof*/false);
-            return Visit(clangCtx.getObjCObjectPointerType(protosOnlyType));
           }
         }
 

test/ClangImporter/Inputs/no-nsobject-protocol.h

@@ -0,0 +1,15 @@
+// Define our own NSObject interface, but not the protocol.
+@interface NSObject
+  - nsobjectFunc;
+@end
+
+@protocol FooProtocol
+  - fooFunc;
+@end
+
+typedef NSObject<FooProtocol> Foo;
+
+@interface Bar : Foo
+- (instancetype)init;
+- (NSObject<FooProtocol> *)barFunc;
+@end

test/ClangImporter/no-nsobject-protocol.swift

@@ -0,0 +1,9 @@
+/// Don't crash when there's no NSObject protocol.
+/// rdar://problem/34597302
+
+// RUN: %target-swift-frontend -typecheck %s -import-objc-header %S/Inputs/no-nsobject-protocol.h -enable-objc-interop
+
+var a = Bar()!
+var b = a.barFunc()!;
+b.nsobjectFunc()
+b.fooFunc()