[test] Test looking up resilient NSObject subclasses

Add tests to make sure we can look up resilient NSObject subclasses in the ObjC runtime.

Author: Harlan Haskins

test/Inputs/resilient_objc_class.swift

@@ -0,0 +1,68 @@
+
+import resilient_struct
+import Foundation
+
+
+// Resilient base class
+
+open class ResilientNSObjectOutsideParent: NSObject {
+  open var property: String = "ResilientNSObjectOutsideParent.property"
+  public final var finalProperty: String = "ResilientNSObjectOutsideParent.finalProperty"
+
+  open class var classProperty: String {
+    return "ResilientNSObjectOutsideParent.classProperty"
+  }
+
+  override public init() {
+    print("ResilientNSObjectOutsideParent.init()")
+  }
+
+  open func method() {
+    print("ResilientNSObjectOutsideParent.method()")
+  }
+
+  open class func classMethod() {
+    print("ResilientNSObjectOutsideParent.classMethod()")
+  }
+
+  open func getValue() -> Int {
+    return 0
+  }
+}
+
+// Resilient generic base class
+
+open class ResilientGenericNSObjectOutsideParent<A>: NSObject {
+  open var property: A
+  public init(property: A) {
+    self.property = property
+    print("ResilientGenericNSObjectOutsideParent.init()")
+  }
+
+  open func method() {
+    print("ResilientGenericNSObjectOutsideParent.method()")
+  }
+
+  open class func classMethod() {
+    print("ResilientGenericNSObjectOutsideParent.classMethod()")
+  }
+}
+
+// Resilient subclass of generic class
+
+open class ResilientConcreteNSObjectOutsideChild : ResilientGenericNSObjectOutsideParent<String> {
+  public override init(property: String) {
+    print("ResilientConcreteNSObjectOutsideChild.init(property: String)")
+    super.init(property: property)
+  }
+
+  open override func method() {
+    print("ResilientConcreteNSObjectOutsideChild.method()")
+    super.method()
+  }
+
+  open override class func classMethod() {
+    print("ResilientConcreteNSObjectOutsideChild.classMethod()")
+    super.classMethod()
+  }
+}

test/Interpreter/SDK/objc_getClass.swift

@@ -6,10 +6,13 @@
 // RUN: %target-build-swift-dylib(%t/%target-library-name(resilient_class)) -Xfrontend -enable-resilience %S/../../Inputs/resilient_class.swift -emit-module -emit-module-path %t/resilient_class.swiftmodule -module-name resilient_class -I%t -L%t -lresilient_struct
 // RUN: %target-codesign %t/%target-library-name(resilient_class)
 
-// RUN: %target-build-swift %s -L %t -I %t -lresilient_struct -lresilient_class -o %t/main %target-rpath(%t)
+// RUN: %target-build-swift-dylib(%t/%target-library-name(resilient_objc_class)) -Xfrontend -enable-resilience %S/../../Inputs/resilient_objc_class.swift -emit-module -emit-module-path %t/resilient_objc_class.swiftmodule -module-name resilient_objc_class -I%t -L%t -lresilient_struct
+// RUN: %target-codesign %t/%target-library-name(resilient_objc_class)
+
+// RUN: %target-build-swift %s -L %t -I %t -lresilient_struct -lresilient_class -lresilient_objc_class -o %t/main %target-rpath(%t)
 // RUN: %target-codesign %t/main
 
-// RUN: %target-run %t/main %t/%target-library-name(resilient_struct) %t/libresilient_class%{target-shared-library-suffix}
+// RUN: %target-run %t/main %t/%target-library-name(resilient_struct) %t/libresilient_class%{target-shared-library-suffix} %t/libresilient_objc_class%{target-shared-library-suffix}
 
 
 // REQUIRES: executable_test
@@ -22,6 +25,7 @@ import ObjectiveC
 import Foundation
 import resilient_struct
 import resilient_class
+import resilient_objc_class
 
 // Old OS versions do not have this hook.
 let getClassHookMissing = {
@@ -110,6 +114,19 @@ class ResilientFieldSubclassObjC : ResilientFieldSuperclassObjC {
   var subvalue = ResilientInt(i: 4)
 }
 
+class ResilientSubclassOfNSObject :  ResilientNSObjectOutsideParent {
+  var subvalue = ResilientInt(i: 5)
+}
+
+class ResilientSubclassOfGenericNSObject :  ResilientGenericNSObjectOutsideParent<Int> {
+  var subvalue = ResilientInt(i: 6)
+  init() { super.init(property: 0) }
+}
+
+class ResilientSubclassOfConcreteNSObject :  ResilientConcreteNSObjectOutsideChild {
+  var subvalue = ResilientInt(i: 7)
+  init() { super.init(property: "") }
+}
 
 func requireClass(named name: String, demangledName: String) {
   for _ in 1...2 {
@@ -124,14 +141,18 @@ func requireClass(named name: String) {
   return requireClass(named: name, demangledName: name)
 }
 
-testSuite.test("Basic") {
+testSuite.test("Basic")
+  .requireOwnProcess()
+  .code {
   requireClass(named: "main.SwiftSubclass")
   requireClass(named: "main.SwiftSuperclass")
   requireClass(named: "main.ObjCSubclass")
   requireClass(named: "main.ObjCSuperclass")
 }
 
-testSuite.test("BasicMangled") {
+testSuite.test("BasicMangled")
+  .requireOwnProcess()
+  .code {
   requireClass(named:   "_TtC4main20MangledSwiftSubclass",
                demangledName: "main.MangledSwiftSubclass")
   requireClass(named:   "_TtC4main22MangledSwiftSuperclass",
@@ -145,6 +166,7 @@ testSuite.test("BasicMangled") {
 testSuite.test("Generic")
   .skip(.custom({ getClassHookMissing },
                 reason: "objc_getClass hook not present"))
+  .requireOwnProcess()
   .code {
   requireClass(named: "main.ConstrainedSwiftSubclass")
   requireClass(named: "main.ConstrainedSwiftSuperclass")
@@ -155,6 +177,7 @@ testSuite.test("Generic")
 testSuite.test("GenericMangled")
   .skip(.custom({ getClassHookMissing },
                 reason: "objc_getClass hook not present"))
+  .requireOwnProcess()
   .code {
   requireClass(named:   "_TtC4main24ConstrainedSwiftSubclass",
                demangledName: "main.ConstrainedSwiftSubclass")
@@ -169,6 +192,7 @@ testSuite.test("GenericMangled")
 testSuite.test("ResilientSubclass")
   .skip(.custom({ getClassHookMissing },
                 reason: "objc_getClass hook not present"))
+  .requireOwnProcess()
   .code {
   requireClass(named: "main.ResilientSubclass")
   requireClass(named: "main.ResilientSuperclass")
@@ -181,6 +205,7 @@ testSuite.test("ResilientSubclass")
 testSuite.test("ResilientField")
   .skip(.custom({ getClassHookMissing },
                 reason: "objc_getClass hook not present"))
+  .requireOwnProcess()
   .code {
   requireClass(named: "main.ResilientFieldSubclassSwift")
   requireClass(named: "main.ResilientFieldSuperclassSwift")
@@ -195,6 +220,23 @@ testSuite.test("ResilientField")
   expectEqual(ResilientFieldSubclassObjC().subvalue.i, 4)
 }
 
+testSuite.test("ResilientNSObject")
+  .skip(.custom({ getClassHookMissing },
+                reason: "objc_getClass hook not present"))
+  .requireOwnProcess()
+  .code {
+  requireClass(named: "_TtC4main27ResilientSubclassOfNSObject",
+               demangledName: "main.ResilientSubclassOfNSObject")
+  requireClass(named: "_TtC4main34ResilientSubclassOfGenericNSObject",
+               demangledName: "main.ResilientSubclassOfGenericNSObject")
+  requireClass(named: "_TtC4main35ResilientSubclassOfConcreteNSObject",
+               demangledName: "main.ResilientSubclassOfConcreteNSObject")
+
+  expectEqual(ResilientSubclassOfNSObject().subvalue.i, 5)
+  expectEqual(ResilientSubclassOfGenericNSObject().subvalue.i, 6)
+  expectEqual(ResilientSubclassOfConcreteNSObject().subvalue.i, 7)
+}
+
 testSuite.test("NotPresent") {
   // This class does not exist.
   expectNil(NSClassFromString("main.ThisClassDoesNotExist"));
@@ -207,4 +249,3 @@ testSuite.test("NotPresent") {
 }
 
 runAllTests()
-