Evolution: Code review feedback for backward deployment tests

Author: slavapestov

validation-test/Evolution/Inputs/backward_deploy_class.swift

@@ -64,22 +64,22 @@ open class OpenClass {
 }
 
 // Inserting a superclass
-open class Bottom {
+open class Top {
   public init() {}
 
-  open func bottomMethod() {}
+  open func topMethod() {}
 }
 
 #if BEFORE
 
-open class Top : Bottom {}
+open class Bottom : Top {}
 
 #else
 
-@_weakLinked open class Middle : Bottom {
+@_weakLinked open class Middle : Top {
   open func middleMethod() {}
 }
 
-open class Top : Middle {}
+open class Bottom : Middle {}
 
 #endif

validation-test/Evolution/Inputs/backward_deploy_protocol.swift

@@ -9,13 +9,17 @@ public func getVersion() -> Int {
 public protocol OtherProtocol {
   init()
 }
-public struct OtherConcrete : OtherProtocol {
+
+#if AFTER
+// Protocol is always available, type is weak-linked
+@_weakLinked public struct OtherConforms : OtherProtocol {
   public init() {}
 }
+#endif
 
 public protocol OldProtocol {
 #if AFTER
-  @_weakLinked associatedtype NewType: OtherProtocol = OtherConcrete
+  @_weakLinked associatedtype NewType: OtherProtocol = OtherConforms
   @_weakLinked func newMethod() -> NewType
 #endif
 }
@@ -28,6 +32,7 @@ extension OldProtocol {
 }
 #endif
 
+// Protocol is weak-linked, type is always available
 #if AFTER
 @_weakLinked public protocol NewProtocol {
   func newMethod()
@@ -44,3 +49,12 @@ public struct NewConforms {
 }
 #endif
 
+// Protocol and type are always available, conformace is weak-linked
+public struct NewConformanceConforms {
+  public init() {}
+}
+public protocol NewConformanceProtocol {}
+
+#if AFTER
+@_weakLinked extension NewConformanceConforms : NewConformanceProtocol {}
+#endif

validation-test/Evolution/test_backward_deploy_class.swift

@@ -70,12 +70,12 @@ BackwardDeployClassTest.test("OpenClass") {
 }
 
 BackwardDeployClassTest.test("InsertSuperclass") {
-  class DerivedClass : Top {
+  class DerivedClass : Bottom {
     var count: Int = 0
 
-    override func bottomMethod() {
+    override func topMethod() {
       count += 1
-      super.bottomMethod()
+      super.topMethod()
     }
 
     override func middleMethod() {
@@ -86,7 +86,7 @@ BackwardDeployClassTest.test("InsertSuperclass") {
 
   let d = DerivedClass()
 
-  d.bottomMethod()
+  d.topMethod()
   if getVersion() == 1 {
     d.middleMethod()
     expectEqual(d.count, 11)

validation-test/Evolution/test_backward_deploy_protocol.swift

@@ -16,8 +16,14 @@ struct ConformsToOldWithNonDefault : OldProtocol {
 
 BackwardDeployProtocolTest.test("OldProtocol") {
   if getVersion() == 1 {
-    _ = ConformsToOldWithDefault().newMethod()
-    _ = ConformsToOldWithNonDefault().newMethod()
+    // FIXME: IRGen inserts the metadata load outside the version check
+    // apparently. Work around that here. <rdar://problem/46438608>
+    @inline(never) func helper() {
+      _ = ConformsToOldWithDefault().newMethod()
+      _ = ConformsToOldWithNonDefault().newMethod()
+    }
+
+    helper()
   }
 }
 
@@ -67,6 +73,23 @@ BackwardDeployProtocolTest.test("RefinedProtocol") {
   }
 }
 
+// Witness tables that are weak-linked for various reasons
+BackwardDeployProtocolTest.test("WeakWitnessTables") {
+  if getVersion() == 1 {
+    // FIXME: IRGen inserts the metadata load outside the version check
+    // apparently. Work around that here. <rdar://problem/46438608>
+    @inline(never) func helper() {
+      func f1<T : OtherProtocol>(_: T) {}
+      func f2<T : NewProtocol>(_: T) {}
+      func f3<T : NewConformanceProtocol>(_: T) {}
+
+      f1(OtherConforms())
+      f2(NewConforms())
+      f3(NewConformanceConforms())
+    }
+  }
+}
+
 // Conditional conformance with weak-linked requirement
 struct Box<T> {}