Merge pull request #82098 from tshortli/revert-availability-tests-move

Revert "Move some availability tests into a new test/Availability directory"

Author: tshortli

test/Constraints/availability.swift

@@ -0,0 +1,88 @@
+// RUN: %target-typecheck-verify-swift -swift-version 4
+
+// Ensure that we do not select the unavailable failable init as the
+// only solution and then fail to typecheck.
+protocol P {}
+
+class C : P {
+  @available(swift, obsoleted: 4)
+  public init?(_ c: C) {
+  }
+
+  public init<T : P>(_ c: T) {}
+}
+
+func f(c: C) {
+  let _: C? = C(c)
+}
+
+// rdar://problem/60047439 - unable to disambiguate expression based on availability
+func test_contextual_member_with_availability() {
+  struct A {
+    static var foo: A = A()
+  }
+
+  struct B {
+    @available(*, unavailable, renamed: "bar")
+    static var foo: B = B()
+  }
+
+  struct Test {
+    init(_: A) {}
+    init(_: B) {}
+  }
+
+  _ = Test(.foo) // Ok
+}
+
+@available(*, unavailable)
+func unavailableFunction(_ x: Int) -> Bool { true } // expected-note {{'unavailableFunction' has been explicitly marked unavailable here}}
+
+/// https://github.com/apple/swift/issues/55700
+/// Availability checking not working in the `where` clause of a `for` loop
+func f_55700(_ arr: [Int]) {
+  for x in arr where unavailableFunction(x) {} // expected-error {{'unavailableFunction' is unavailable}}
+}
+
+// rdar://101814209
+public struct Box<T> {
+  @usableFromInline
+  let value: T
+}
+
+@available(macOS, unavailable)
+extension Box where T == Int {
+  @usableFromInline
+  init(value: T) {
+    self.value = value
+  }
+}
+
+@available(macOS, unavailable)
+@_alwaysEmitIntoClient public func aeicFunction() {
+  // Select the unavailable @usableFromInline init over the synthesized internal
+  // memberwise initializer.
+  _ = Box(value: 42)
+}
+
+// rdar://87403752 - ambiguity with member declared in unavailable extension
+struct HasUnavailableExtesion {
+}
+
+@available(*, unavailable)
+extension HasUnavailableExtesion {
+  static var foo: Self = HasUnavailableExtesion()
+}
+
+func test_contextual_member_with_unavailable_extension() {
+  struct A {
+    static var foo: A = A()
+  }
+
+  struct Test {
+    init(_: A) {}
+    init(_: HasUnavailableExtesion) {}
+  }
+
+  _ = Test(.foo) // Ok `A.foo` since `foo` from `HasUnavailableExtesion` is unavailable
+}

test/Availability/availability_macos.swift renamed to test/Constraints/availability_macos.swift

@@ -20,7 +20,7 @@ EXCEPTIONAL_FILES = [
     # Tests for ModuleInterfaceExportAs being ignored
     pathlib.Path("test/ModuleInterface/swift-export-as.swift"),
     # Uses the pseudo-feature AvailabilityMacro=
-    pathlib.Path("test/Availability/availability_define.swift"),
+    pathlib.Path("test/Sema/availability_define.swift"),
     # Tests behavior when you try to use a feature without enabling it
     pathlib.Path("test/attr/feature_requirement.swift"),
     # Tests completion with features both enabled and disabled

test/Availability/operator_availability.swift renamed to test/Constraints/operator_availability.swift

@@ -86,90 +86,3 @@ struct DeferBody {
     // expected-error@-1 {{'No' is unavailable}}
   }
 }
-
-// Ensure that we do not select the unavailable failable init as the
-// only solution and then fail to typecheck.
-protocol P {}
-
-class C : P {
-  @available(swift, obsoleted: 4)
-  public init?(_ c: C) {
-  }
-
-  public init<T : P>(_ c: T) {}
-}
-
-func f(c: C) {
-  let _: C? = C(c)
-}
-
-// rdar://problem/60047439 - unable to disambiguate expression based on availability
-func test_contextual_member_with_availability() {
-  struct A {
-    static var foo: A = A()
-  }
-
-  struct B {
-    @available(*, unavailable, renamed: "bar")
-    static var foo: B = B()
-  }
-
-  struct Test {
-    init(_: A) {}
-    init(_: B) {}
-  }
-
-  _ = Test(.foo) // Ok
-}
-
-@available(*, unavailable)
-func unavailableFunction(_ x: Int) -> Bool { true } // expected-note {{'unavailableFunction' has been explicitly marked unavailable here}}
-
-/// https://github.com/apple/swift/issues/55700
-/// Availability checking not working in the `where` clause of a `for` loop
-func f_55700(_ arr: [Int]) {
-  for x in arr where unavailableFunction(x) {} // expected-error {{'unavailableFunction' is unavailable}}
-}
-
-// rdar://101814209
-public struct Box<T> {
-  @usableFromInline
-  let value: T
-}
-
-@available(macOS, unavailable)
-extension Box where T == Int {
-  @usableFromInline
-  init(value: T) {
-    self.value = value
-  }
-}
-
-@available(macOS, unavailable)
-@_alwaysEmitIntoClient public func aeicFunction() {
-  // Select the unavailable @usableFromInline init over the synthesized internal
-  // memberwise initializer.
-  _ = Box(value: 42)
-}
-
-// rdar://87403752 - ambiguity with member declared in unavailable extension
-struct HasUnavailableExtesion {
-}
-
-@available(*, unavailable)
-extension HasUnavailableExtesion {
-  static var foo: Self = HasUnavailableExtesion()
-}
-
-func test_contextual_member_with_unavailable_extension() {
-  struct A {
-    static var foo: A = A()
-  }
-
-  struct Test {
-    init(_: A) {}
-    init(_: HasUnavailableExtesion) {}
-  }
-
-  _ = Test(.foo) // Ok `A.foo` since `foo` from `HasUnavailableExtesion` is unavailable
-}