Add @_objcImpl stored property execution tests

Author: beccadax

test/Interpreter/Inputs/objc_implementation.h

@@ -1,8 +1,16 @@
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 @interface ImplClass : NSObject
 
+- (instancetype)init;
+
+@property (assign) NSInteger implProperty;
+
 + (void)runTests;
 - (nonnull NSString *)someMethod;
 
 @end
+
+NS_ASSUME_NONNULL_END

test/Interpreter/objc_implementation.swift

@@ -5,21 +5,55 @@
 import Foundation
 
 @_objcImplementation extension ImplClass {
+  @objc override init() {
+    self.implProperty = 0
+    super.init()
+  }
+
+  @objc var implProperty: Int
+
   @objc class func runTests() {
-    print(ImplClass().someMethod())
-    print(SwiftSubclass().someMethod())
+    let impl = ImplClass()
+    print("someMethod =", impl.someMethod())
+    print("implProperty =", impl.implProperty)
+    impl.implProperty = 42
+    print("implProperty =", impl.implProperty)
+
+    let swiftSub = SwiftSubclass()
+    print("someMethod =", swiftSub.someMethod())
+    print("implProperty =", swiftSub.implProperty)
+    swiftSub.implProperty = 42
+    print("implProperty =", swiftSub.implProperty)
+
+    print("otherProperty =", swiftSub.otherProperty)
+    swiftSub.otherProperty = 13
+    print("otherProperty =", swiftSub.otherProperty)
+    print("implProperty =", swiftSub.implProperty)
   }
 
   @objc func someMethod() -> String { "ImplClass.someMethod()" }
 }
 
 class SwiftSubclass: ImplClass {
+  @objc var otherProperty: Int = 1
+
+  override init() {
+    super.init()
+  }
+
   override func someMethod() -> String { "SwiftSubclass.someMethod()" }
 }
 
 // `#if swift` to ignore the inactive branch's contents
 #if swift(>=5.0) && TOP_LEVEL_CODE
 ImplClass.runTests()
-// CHECK: ImplClass.someMethod()
-// CHECK: SwiftSubclass.someMethod()
+// CHECK: someMethod = ImplClass.someMethod()
+// CHECK: implProperty = 0
+// CHECK: implProperty = 42
+// CHECK: someMethod = SwiftSubclass.someMethod()
+// CHECK: implProperty = 0
+// CHECK: implProperty = 42
+// CHECK: otherProperty = 1
+// CHECK: otherProperty = 13
+// CHECK: implProperty = 42
 #endif

test/Interpreter/objc_implementation_objc_client.m

@@ -25,6 +25,8 @@
 
 @interface ObjCClientSubclass : ImplClass
 
+@property (assign) NSInteger otherProperty;
+
 - (NSString *)someMethod;
 
 @end
@@ -49,24 +51,62 @@ static void print(NSString *str) {
   }
 }
 
+static void printInt(NSString *str, NSUInteger num) {
+  NSString *fullStr =
+    [NSString stringWithFormat:@"%@ %lld", str, (long long)num];
+  print(fullStr);
+}
+
 int main() {
   [ImplClass runTests];
-  // CHECK: ImplClass.someMethod()
-  // CHECK: SwiftSubclass.someMethod()
+  // CHECK: someMethod = ImplClass.someMethod()
+  // CHECK: implProperty = 0
+  // CHECK: implProperty = 42
+  // CHECK: someMethod = SwiftSubclass.someMethod()
+  // CHECK: implProperty = 0
+  // CHECK: implProperty = 42
+  // CHECK: otherProperty = 1
+  // CHECK: otherProperty = 13
+  // CHECK: implProperty = 42
 
   fflush(stdout);
 
-  print([[[ImplClass alloc] init] someMethod]);
+  ImplClass *impl = [[ImplClass alloc] init];
+  print([impl someMethod]);
   // CHECK: ImplClass.someMethod()
-
-  print([[[ObjCClientSubclass alloc] init] someMethod]);
+  printInt(@"implProperty", impl.implProperty);
+  // CHECK: implProperty 0
+  impl.implProperty = -2;
+  printInt(@"implProperty", impl.implProperty);
+  // CHECK: implProperty -2
+
+  ObjCClientSubclass *objcSub = [[ObjCClientSubclass alloc] init];
+  print([objcSub someMethod]);
   // CHECK: -[ObjCClientSubclass someMethod]
 
+  printInt(@"implProperty", objcSub.implProperty);
+  // CHECK: implProperty 0
+  printInt(@"otherProperty", objcSub.otherProperty);
+  // CHECK: otherProperty 4
+  objcSub.implProperty = 7;
+  objcSub.otherProperty = 9;
+  printInt(@"implProperty", objcSub.implProperty);
+  // CHECK: implProperty 7
+  printInt(@"otherProperty", objcSub.otherProperty);
+  // CHECK: otherProperty 9
+
   return 0;
 }
 
 @implementation ObjCClientSubclass
 
+- (id)init {
+  if (self = [super init]) {
+    _otherProperty = 4;
+  }
+  return self;
+}
+
 - (NSString *)someMethod {
   return @"-[ObjCClientSubclass someMethod]";
 }

test/Interpreter/objc_implementation_swift_client.swift

@@ -33,16 +33,33 @@ import Foundation
 import objc_implementation
 
 ImplClass.runTests()
-// CHECK: ImplClass.someMethod()
-// CHECK: SwiftSubclass.someMethod()
+// CHECK: someMethod = ImplClass.someMethod()
+// CHECK: implProperty = 0
+// CHECK: implProperty = 42
+// CHECK: someMethod = SwiftSubclass.someMethod()
+// CHECK: implProperty = 0
+// CHECK: implProperty = 42
+// CHECK: otherProperty = 1
+// CHECK: otherProperty = 13
+// CHECK: implProperty = 42
 
-print(ImplClass().someMethod())
-// CHECK: ImplClass.someMethod()
+let impl = ImplClass()
+print(impl.someMethod(), impl.implProperty)
+// CHECK: ImplClass.someMethod() 0
 
 class SwiftClientSubclass: ImplClass {
+  override init() {}
+  var otherProperty = 2
   override func someMethod() -> String { "SwiftClientSubclass.someMethod()" }
 }
 
-print(SwiftClientSubclass().someMethod())
+let swiftClientSub = SwiftClientSubclass()
+print(swiftClientSub.someMethod())
 // CHECK: SwiftClientSubclass.someMethod()
+print(swiftClientSub.implProperty, swiftClientSub.otherProperty)
+// CHECK: 0 2
+swiftClientSub.implProperty = 3
+swiftClientSub.otherProperty = 9
+print(swiftClientSub.implProperty, swiftClientSub.otherProperty)
+// CHECK: 3 9