[ClangImporter] Handle property with getter that returns instancetype

lib/ClangImporter/ImportDecl.cpp

@@ -3772,7 +3772,7 @@ namespace {
 
       // If the method has a related result type that is representable
       // in Swift as DynamicSelf, do so.
-      if (decl->hasRelatedResultType()) {
+      if (!prop && decl->hasRelatedResultType()) {
         result->setDynamicSelf(true);
         resultTy = DynamicSelfType::get(dc->getSelfInterfaceType(),
                                         Impl.SwiftContext);

test/ClangImporter/Inputs/custom-modules/ObjCParseExtras.h

@@ -198,3 +198,8 @@ typedef SomeCell <NSCopying> *CopyableSomeCell;
 // Note the custom setter name here; this is important.
 @property (setter=takeFooForBar:) BOOL fooForBar;
 @end
+
+@interface InstancetypeAccessor : NSObject
+@property (class, readonly) InstancetypeAccessor *prop;
++ (instancetype)prop;
+@end

test/ClangImporter/objc_parse_verifier.swift

@@ -0,0 +1,15 @@
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-sil -I %S/Inputs/custom-modules %s -verify > /dev/null
+
+// REQUIRES: objc_interop
+// expected-no-diagnostics
+
+// This file tests the AST verifier, which performs extra checks when there are
+// no errors emitted. Please do not add any.
+
+
+import ObjCParseExtras
+
+func test() {
+  // Properties with instancetype getters.
+  _ = InstancetypeAccessor.prop
+}