Fix add_conformance evolution tests to pass with optimized builds

Even dynamically casting a generic parameter to a protocol type is only
guaranteed to succeed for conformances available at build time.

Since we can't express conditional availability of conformances yet,
this part of the test is useless, so redo it.

Author: slavapestov

validation-test/Evolution/Inputs/struct_fixed_layout_add_conformance.swift

@@ -38,3 +38,11 @@ public protocol Point3DLike {
 extension AddConformance : PointLike {}
 extension AddConformance : Point3DLike {}
 #endif
+
+public func workWithPointLike<T>(t: T) -> Int {
+  if let p = t as? PointLike {
+    return p.x * p.y
+  } else {
+    return 0
+  }
+}

validation-test/Evolution/Inputs/struct_resilient_add_conformance.swift

@@ -38,3 +38,11 @@ public protocol Point3DLike {
 extension AddConformance : PointLike {}
 extension AddConformance : Point3DLike {}
 #endif
+
+public func workWithPointLike<T>(t: T) -> Int {
+  if let p = t as? PointLike {
+    return p.x * p.y
+  } else {
+    return 0
+  }
+}

validation-test/Evolution/test_struct_fixed_layout_add_conformance.swift

@@ -20,28 +20,12 @@
 // RUN: %target-run %t/after_after
 
 // REQUIRES: executable_test
-// REQUIRES: swift_test_mode_optimize_none
 
 import StdlibUnittest
 import struct_fixed_layout_add_conformance
 
 var StructFixedLayoutAddConformanceTest = TestSuite("StructFixedLayoutAddConformance")
 
-// FIXME: Once we have availability information for conformances, we can
-// make this non-generic as long as we're careful to never directly
-// reference an unavailable conformance table symbol
-@inline(never) func workWithPointLike<T>(t: T) {
-  if getVersion() > 0 {
-    var p = t as! PointLike
-    p.x = 30
-    p.y = 40
-    expectEqual(p.x, 30)
-    expectEqual(p.y, 40)
-  } else {
-    expectEqual(t is PointLike, false)
-  }
-}
-
 StructFixedLayoutAddConformanceTest.test("AddConformance") {
   var t = AddConformance()
 
@@ -52,7 +36,11 @@ StructFixedLayoutAddConformanceTest.test("AddConformance") {
     expectEqual(t.y, 20)
   }
 
-  workWithPointLike(t)
+  if (getVersion() == 0) {
+    expectEqual(workWithPointLike(t), 0)
+  } else {
+    expectEqual(workWithPointLike(t), 200)
+  }
 }
 
 #if AFTER

validation-test/Evolution/test_struct_resilient_add_conformance.swift

@@ -20,28 +20,12 @@
 // RUN: %target-run %t/after_after
 
 // REQUIRES: executable_test
-// REQUIRES: swift_test_mode_optimize_none
 
 import StdlibUnittest
 import struct_resilient_add_conformance
 
 var StructResilientAddConformanceTest = TestSuite("StructResilientAddConformance")
 
-// FIXME: Once we have availability information for conformances, we can
-// make this non-generic as long as we're careful to never directly
-// reference an unavailable conformance table symbol
-@inline(never) func workWithPointLike<T>(t: T) {
-  if getVersion() > 0 {
-    var p = t as! PointLike
-    p.x = 30
-    p.y = 40
-    expectEqual(p.x, 30)
-    expectEqual(p.y, 40)
-  } else {
-    expectEqual(t is PointLike, false)
-  }
-}
-
 StructResilientAddConformanceTest.test("AddConformance") {
   var t = AddConformance()
 
@@ -52,7 +36,11 @@ StructResilientAddConformanceTest.test("AddConformance") {
     expectEqual(t.y, 20)
   }
 
-  workWithPointLike(t)
+  if (getVersion() == 0) {
+    expectEqual(workWithPointLike(t), 0)
+  } else {
+    expectEqual(workWithPointLike(t), 200)
+  }
 }
 
 #if AFTER