Tests: Consolidate opaque result type availability tests.

Author: tshortli

test/Sema/availability.swift

@@ -86,15 +86,3 @@ struct DeferBody {
     // expected-error@-1 {{'No' is unavailable}}
   }
 }
-
-struct NotP {}
-
-protocol P {}
-
-@available(*, unavailable)
-extension NotP: P {} // expected-note {{conformance of 'NotP' to 'P' has been explicitly marked unavailable here}}
-
-@available(SwiftStdlib 5.1, *)
-func requireP() -> some P {
-  NotP() // expected-error {{conformance of 'NotP' to 'P' is unavailable}}
-}

test/type/opaque_availability.swift

@@ -1,13 +1,21 @@
-// RUN: %target-swift-frontend -parse-stdlib -target x86_64-apple-macosx10.9 -typecheck -verify %s
-// RUN: %target-swift-frontend -parse-stdlib -target x86_64-apple-macosx10.15 -typecheck %s
+// RUN: %target-swift-frontend -parse-stdlib -target x86_64-apple-macosx10.9 -typecheck %s -verify -verify-additional-prefix only-available-
+// RUN: %target-swift-frontend -parse-stdlib -target x86_64-apple-macosx10.15 -typecheck %s -verify
 // REQUIRES: OS=macosx
 
 protocol P {}
 struct X: P {}
 
-func alwaysOpaque() -> some P { return X() } // expected-error{{'some' return types are only available}} expected-note{{add @available}}
+func alwaysOpaque() -> some P { return X() } // expected-only-available-error{{'some' return types are only available}} expected-only-available-note{{add @available}}
 
-@available(macOS 10.15, iOS 13, tvOS 13, watchOS 6, *)
+@available(SwiftStdlib 5.1, *)
 func sometimesOpaque() -> some P { return X() }
 
+struct NotP {}
 
+@available(*, unavailable)
+extension NotP: P {} // expected-note {{conformance of 'NotP' to 'P' has been explicitly marked unavailable here}}
+
+@available(SwiftStdlib 5.1, *)
+func requireP() -> some P {
+  NotP() // expected-error {{conformance of 'NotP' to 'P' is unavailable}}
+}