[ClangImporter] Implement importing of ObjC class properties.

For the most part this was just "check isInstanceProperty"; the one feature not yet implemented
is the emission of ObjC metadata for class properties.

rdar://problem/16830785

Author: jrose-apple

lib/ClangImporter/ImportDecl.cpp

@@ -5204,7 +5204,8 @@ namespace {
                           NL_QualifiedDefault | NL_KnownNoDependency,
                           Impl.getTypeResolver(), lookup);
       for (auto result : lookup) {
-        if (isa<FuncDecl>(result) && result->isInstanceMember() &&
+        if (isa<FuncDecl>(result) &&
+            result->isInstanceMember() == decl->isInstanceProperty() &&
             result->getFullName().getArgumentNames().empty())
           return nullptr;
 
@@ -5257,7 +5258,7 @@ namespace {
       }
 
       auto result = Impl.createDeclWithClangNode<VarDecl>(decl,
-          /*static*/ false, /*IsLet*/ false,
+          decl->isClassProperty(), /*IsLet*/ false,
           Impl.importSourceLoc(decl->getLocation()),
           name, type, dc);
       result->setInterfaceType(ArchetypeBuilder::mapTypeOutOfContext(dc, type));

lib/PrintAsObjC/PrintAsObjC.cpp

@@ -566,17 +566,12 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
 
     printDocumentationComment(VD);
 
-    if (VD->isStatic()) {
-      // Objective-C doesn't have class properties. Just print the accessors.
-      printAbstractFunctionAsMethod(VD->getGetter(), true);
-      if (auto setter = VD->getSetter())
-        printAbstractFunctionAsMethod(setter, true);
-      return;
-    }
-
     // For now, never promise atomicity.
     os << "@property (nonatomic";
 
+    if (!VD->isInstanceMember())
+      os << ", class";
+
     ASTContext &ctx = M.getASTContext();
     bool isSettable = VD->isSettable(nullptr);
     if (isSettable && ctx.LangOpts.EnableAccessControl)

test/ClangModules/Inputs/SwiftPrivateAttr.txt

@@ -4,6 +4,7 @@ protocol __PrivProto {
 }
 class Foo : NSObject, __PrivProto {
   var __privValue: AnyObject!
+  class var __privClassValue: AnyObject!
   func __noArgs()
   func __oneArg(arg: Int32)
   func __twoArgs(arg: Int32, other arg2: Int32)

test/ClangModules/Inputs/custom-modules/ObjCIRExtras.h

@@ -30,6 +30,7 @@
 - (void)methodInt:(NSInteger)value SWIFT_NAME(theMethod(number:));
 
 @property (readonly) int someProp SWIFT_NAME(renamedSomeProp);
+@property (readonly, class) int classProp SWIFT_NAME(renamedClassProp);
 @end
 
 @interface SwiftNameTestError : NSObject

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

@@ -8,28 +8,36 @@ __attribute__((objc_root_class))
 
 @interface PropertyAndMethodCollisionBase
 - (void)object:(id)obj doSomething:(SEL)selector;
++ (void)classRef:(id)obj doSomething:(SEL)selector;
 @end
 
 @interface PropertyAndMethodCollision : PropertyAndMethodCollisionBase
 @property id object;
+@property (class) id classRef;
 @end
 
 @interface PropertyAndMethodReverseCollisionBase
 @property id object;
+@property (class) id classRef;
 @end
 
 @interface PropertyAndMethodReverseCollision : PropertyAndMethodReverseCollisionBase
 - (void)object:(id)obj doSomething:(SEL)selector;
++ (void)classRef:(id)obj doSomething:(SEL)selector;
 @end
 
 @protocol PropertyProto
 @property id protoProp;
 @property(readonly) id protoPropRO;
+@property(class) id protoClassProp;
+@property(class, readonly) id protoClassPropRO;
 @end
 
 @interface PropertyAndMethodCollision () <PropertyProto>
 - (id)protoProp;
 - (id)protoPropRO;
++ (id)protoClassProp;
++ (id)protoClassPropRO;
 @end
 
 

test/ClangModules/Inputs/custom-modules/SwiftPrivateAttr.h

@@ -8,6 +8,7 @@ NS_REFINED_FOR_SWIFT
 
 @interface Foo : NSObject <PrivProto>
 @property id privValue NS_REFINED_FOR_SWIFT;
+@property (class) id privClassValue NS_REFINED_FOR_SWIFT;
 
 - (void)noArgs NS_REFINED_FOR_SWIFT;
 - (void)oneArg:(int)arg NS_REFINED_FOR_SWIFT;

test/ClangModules/attr-swift_name.swift

@@ -12,13 +12,16 @@ func test(i: Int) {
   t.theMethod(number: i)
 
   _ = t.renamedSomeProp
+  _ = t.dynamicType.renamedClassProp
 
   // We only see these two warnings because Clang can catch the other invalid
   // cases, and marks the attribute as invalid ahead of time.
 
   // CHECK: warning: too few parameters in swift_name attribute (expected 2; got 1)
   // CHECK: + (instancetype)g:(id)x outParam:(int *)foo SWIFT_NAME(init(g:));
-  
+
+  // CHECK-NOT: warning:
+
   // CHECK: warning: too few parameters in swift_name attribute (expected 2; got 1)
   // CHECK: + (instancetype)testW:(id)x out:(id *)outObject SWIFT_NAME(ww(_:));
 }

test/ClangModules/attr-swift_private.swift

@@ -21,6 +21,10 @@ public func testProperty(foo: Foo) {
   // CHECK: @"\01L_selector(setPrivValue:)"
   _ = foo.__privValue
   foo.__privValue = foo
+
+  // CHECK: @"\01L_selector(setPrivClassValue:)"
+  _ = Foo.__privClassValue
+  Foo.__privClassValue = foo
 
 #if !IRGEN
   _ = foo.privValue // expected-error {{value of type 'Foo' has no member 'privValue'}}

test/ClangModules/objc_ir.swift

@@ -70,6 +70,12 @@ func propertyAccess(b b: B) {
    // CHECK: load i8*, i8** @"\01L_selector(counter)"
    // CHECK: load i8*, i8** @"\01L_selector(setCounter:)"
    b.counter = b.counter + 1
+
+   // CHECK: call %swift.type* @_TMaCSo1B()
+   // CHECK: bitcast %swift.type* {{%.+}} to %objc_class*
+   // CHECK: load i8*, i8** @"\01L_selector(sharedCounter)"
+   // CHECK: load i8*, i8** @"\01L_selector(setSharedCounter:)"
+   B.sharedCounter = B.sharedCounter + 1
 }
 
 // CHECK: define hidden [[B]]* @_TF7objc_ir8downcastFT1aCSo1A_CSo1B(

test/ClangModules/objc_parse.swift

@@ -379,11 +379,20 @@ func testPropertyAndMethodCollision(obj: PropertyAndMethodCollision,
   obj.object = nil
   obj.object(obj, doSomething:Selector("action"))
 
+  obj.dynamicType.classRef = nil
+  obj.dynamicType.classRef(obj, doSomething:Selector("action"))
+
   rev.object = nil
   rev.object(rev, doSomething:Selector("action"))
 
-  var value: AnyObject = obj.protoProp()
+  rev.dynamicType.classRef = nil
+  rev.dynamicType.classRef(rev, doSomething:Selector("action"))
+
+  var value: AnyObject
+  value = obj.protoProp()
   value = obj.protoPropRO()
+  value = obj.dynamicType.protoClassProp()
+  value = obj.dynamicType.protoClassPropRO()
   _ = value
 }
 

test/IDE/Inputs/mock-sdk/Foo.annotated.txt

@@ -224,6 +224,17 @@ class <loc>FooClassDerived</loc> : <ref:Class>FooClassBase</ref>, <ref:Protocol>
   <decl:Constructor><loc>init!()</loc></decl>
   <decl:Constructor>convenience <loc>init!(<decl:Param>float f: <ref:Struct>Float</ref></decl>)</loc></decl>
 }</decl>
+<decl:Class>class <loc>FooClassWithClassProperties</loc> : <ref:Class>FooClassBase</ref> {
+  <decl:Var>unowned(unsafe) class var <loc>assignable</loc>: @sil_unmanaged <ref:Protocol>AnyObject</ref>!</decl>
+  <decl:Var>unowned(unsafe) class var <loc>unsafeAssignable</loc>: @sil_unmanaged <ref:Protocol>AnyObject</ref>!</decl>
+  <decl:Var>class var <loc>retainable</loc>: <ref:Protocol>AnyObject</ref>!</decl>
+  <decl:Var>class var <loc>strongRef</loc>: <ref:Protocol>AnyObject</ref>!</decl>
+  <decl:Var>@NSCopying class var <loc>copyable</loc>: <ref:Protocol>AnyObject</ref>!</decl>
+  <decl:Var>weak class var <loc>weakRef</loc>: @sil_weak <ref:Protocol>AnyObject</ref>!</decl>
+  <decl:Var>class var <loc>scalar</loc>: <ref:Struct>Int32</ref></decl>
+  <decl:Constructor><loc>init!()</loc></decl>
+  <decl:Constructor>convenience <loc>init!(<decl:Param>float f: <ref:Struct>Float</ref></decl>)</loc></decl>
+}</decl>
 <decl:Class>class <loc>FooUnavailableMembers</loc> : <ref:Class>FooClassBase</ref> {
   <decl:Constructor>convenience <loc>init!(<decl:Param>int i: <ref:Struct>Int32</ref></decl>)</loc></decl>
   <decl:Func>@available(*, unavailable, message: "use object construction 'FooUnavailableMembers(int:)'")

test/IDE/Inputs/mock-sdk/Foo.framework/Headers/Foo.h

@@ -238,6 +238,16 @@ struct _InternalStruct {
 @property (assign) int scalar;
 @end
 
+@interface FooClassWithClassProperties : FooClassBase
+@property (class, assign) id assignable;
+@property (class, unsafe_unretained) id unsafeAssignable;
+@property (class, retain) id retainable;
+@property (class, strong) id strongRef;
+@property (class, copy) id copyable;
+@property (class, weak) id weakRef;
+@property (class, assign) int scalar;
+@end
+
 #define FOO_NIL ((id)0)
 
 @interface FooUnavailableMembers : FooClassBase

test/IDE/Inputs/mock-sdk/Foo.printed.recursive.txt

@@ -224,6 +224,17 @@ class FooClassPropertyOwnership : FooClassBase {
   init!()
   convenience init!(float f: Float)
 }
+class FooClassWithClassProperties : FooClassBase {
+  unowned(unsafe) class var assignable: @sil_unmanaged AnyObject!
+  unowned(unsafe) class var unsafeAssignable: @sil_unmanaged AnyObject!
+  class var retainable: AnyObject!
+  class var strongRef: AnyObject!
+  @NSCopying class var copyable: AnyObject!
+  weak class var weakRef: @sil_weak AnyObject!
+  class var scalar: Int32
+  init!()
+  convenience init!(float f: Float)
+}
 class FooUnavailableMembers : FooClassBase {
   convenience init!(int i: Int32)
   @available(*, unavailable, message: "use object construction 'FooUnavailableMembers(int:)'")

test/IDE/Inputs/mock-sdk/Foo.printed.txt

@@ -274,6 +274,18 @@ class FooClassPropertyOwnership : FooClassBase {
   convenience init!(float f: Float)
 }
 
+class FooClassWithClassProperties : FooClassBase {
+  unowned(unsafe) class var assignable: @sil_unmanaged AnyObject!
+  unowned(unsafe) class var unsafeAssignable: @sil_unmanaged AnyObject!
+  class var retainable: AnyObject!
+  class var strongRef: AnyObject!
+  @NSCopying class var copyable: AnyObject!
+  weak class var weakRef: @sil_weak AnyObject!
+  class var scalar: Int32
+  init!()
+  convenience init!(float f: Float)
+}
+
 class FooUnavailableMembers : FooClassBase {
   convenience init!(int i: Int32)
   @available(*, unavailable, message: "use object construction 'FooUnavailableMembers(int:)'")

test/Inputs/clang-importer-sdk/usr/include/objc/NSObject.h

@@ -61,6 +61,7 @@
 - performMultiplyWithValue:(int)x value:(int)y;
 - moveFor:(int)x;
 @property (readonly) int readCounter;
+@property (class) int sharedCounter;
 
 @property int informalMadeFormal;
 

test/Interpreter/Inputs/ObjCClasses/ObjCClasses.h

@@ -58,6 +58,35 @@ NS_ASSUME_NONNULL_BEGIN
 @interface AnimalContainer<C: Animal *> : Container<C>
 @end
 
+#if __has_feature(objc_class_property)
+@protocol ProtoWithClassProperty
++ (void)reset;
+@property (class) int value;
+
+@optional
+@property (class, readonly) BOOL optionalClassProp;
+@end
+
+@interface ClassWithClassProperty : NSObject <ProtoWithClassProperty>
+@end
+
+@interface ObjCSubclassWithClassProperty : ClassWithClassProperty
+// Deliberately redeclared.
+@property (class) int value;
+@end
+
+@protocol PropertyNamingConflictProto
+@property (nullable) id protoProp;
+@property (class, nullable) id protoProp;
+@end
+
+@interface PropertyNamingConflict : NSObject
+@property (readonly, nullable) id prop;
+@property (class, readonly, nullable) id prop;
+@end
+
+#endif // __has_feature(objc_class_property)
+
 NS_ASSUME_NONNULL_END
 
 #endif

test/Interpreter/Inputs/ObjCClasses/ObjCClasses.m

@@ -81,3 +81,30 @@ - (NSString *)noise {
 @implementation AnimalContainer
 @end
 
+#if __has_feature(objc_class_property)
+static int _value = 0;
+@implementation ClassWithClassProperty
++ (int)value {
+  return _value;
+}
++ (void)setValue:(int)newValue {
+  _value = newValue;
+}
++ (void)reset {
+  _value = 0;
+}
+@end
+
+@implementation ObjCSubclassWithClassProperty
++ (BOOL)optionalClassProp {
+  return YES;
+}
+@end
+
+@implementation PropertyNamingConflict
+- (id)prop { return self; }
++ (id)prop { return nil; }
+@end
+
+#endif
+