ModuleInterface: Adopt swiftinterface verification lit substitutions in back-deploy-attr.swift. Simplify the test now that another test exercises deserialization of the attribute from a module.

Author: tshortli

test/ModuleInterface/back-deploy-attr.swift

@@ -1,63 +1,46 @@
 // RUN: %empty-directory(%t)
-
-// Ensure @_backDeploy attributes and function bodies are printed in
-// swiftinterface files.
-// RUN: %target-swiftc_driver -emit-module -o %t/Test.swiftmodule -emit-module-interface-path %t/Test.swiftinterface %s -enable-library-evolution -verify-emitted-module-interface -module-name Test \
-// RUN:   -Xfrontend -define-availability -Xfrontend "_macOS12_1:macOS 12.1" \
-// RUN:   -Xfrontend -define-availability -Xfrontend "_myProject 1.0:macOS 12.1, iOS 15.1"
-// RUN: %FileCheck %s --check-prefix FROMSOURCE --check-prefix CHECK < %t/Test.swiftinterface
-
-// FIXME(backDeploy): Remove this step in favor of a test that exercises using
-// a back deployed API from a test library so that we can avoid -merge-modules
-
-// Ensure @_backDeploy attributes and function bodies are present after
-// deserializing .swiftmodule files.
-// RUN: %target-swift-frontend -emit-module -o /dev/null -merge-modules %t/Test.swiftmodule -disable-objc-attr-requires-foundation-module -emit-module-interface-path %t/TestFromModule.swiftinterface -module-name Test \
+// RUN: %target-swift-emit-module-interface(%t/Test.swiftinterface) %s \
 // RUN:   -define-availability "_macOS12_1:macOS 12.1" \
 // RUN:   -define-availability "_myProject 1.0:macOS 12.1, iOS 15.1"
-// RUN: %FileCheck %s --check-prefix FROMMODULE --check-prefix CHECK < %t/TestFromModule.swiftinterface
+// RUN: %target-swift-typecheck-module-from-interface(%t/Test.swiftinterface)
+// RUN: %FileCheck %s < %t/Test.swiftinterface
 
 public struct TopLevelStruct {
   // CHECK: @_backDeploy(before: macOS 12.0)
-  // FROMSOURCE: public func backDeployedFunc_SinglePlatform() -> Swift.Int { return 42 }
-  // FROMMODULE: public func backDeployedFunc_SinglePlatform() -> Swift.Int
+  // CHECK: public func backDeployedFunc_SinglePlatform() -> Swift.Int { return 42 }
   @available(macOS 11.0, *)
   @_backDeploy(before: macOS 12.0)
   public func backDeployedFunc_SinglePlatform() -> Int { return 42 }
 
   // CHECK: @_backDeploy(before: macOS 12.0)
   // CHECK: @_backDeploy(before: iOS 15.0)
-  // FROMSOURCE: public func backDeployedFunc_MultiPlatform() -> Swift.Int { return 43 }
-  // FROMMODULE: public func backDeployedFunc_MultiPlatform() -> Swift.Int
+  // CHECK: public func backDeployedFunc_MultiPlatform() -> Swift.Int { return 43 }
   @available(macOS 11.0, iOS 14.0, *)
   @_backDeploy(before: macOS 12.0, iOS 15.0)
   public func backDeployedFunc_MultiPlatform() -> Int { return 43 }
 
   // CHECK: @_backDeploy(before: macOS 12.0)
-  // FROMSOURCE: public var backDeployedComputedProperty: Swift.Int {
-  // FROMSOURCE:   get { 44 }
-  // FROMSOURCE: }
-  // FROMMODULE: public var backDeployedComputedProperty: Swift.Int
+  // CHECK: public var backDeployedComputedProperty: Swift.Int {
+  // CHECK:   get { 44 }
+  // CHECK: }
   @available(macOS 11.0, *)
   @_backDeploy(before: macOS 12.0)
   public var backDeployedComputedProperty: Int { 44 }
 
   // CHECK: @_backDeploy(before: macOS 12.0)
-  // FROMSOURCE: public var backDeployedPropertyWithAccessors: Swift.Int {
-  // FROMSOURCE:   get { 45 }
-  // FROMSOURCE: }
-  // FROMMODULE: public var backDeployedPropertyWithAccessors: Swift.Int
+  // CHECK: public var backDeployedPropertyWithAccessors: Swift.Int {
+  // CHECK:   get { 45 }
+  // CHECK: }
   @available(macOS 11.0, *)
   @_backDeploy(before: macOS 12.0)
   public var backDeployedPropertyWithAccessors: Int {
     get { 45 }
   }
 
   // CHECK: @_backDeploy(before: macOS 12.0)
-  // FROMSOURCE: public subscript(index: Swift.Int) -> Swift.Int {
-  // FROMSOURCE:   get { 46 }
-  // FROMSOURCE: }
-  // FROMMODULE: public subscript(index: Swift.Int) -> Swift.Int
+  // CHECK: public subscript(index: Swift.Int) -> Swift.Int {
+  // CHECK:   get { 46 }
+  // CHECK: }
   @available(macOS 11.0, *)
   @_backDeploy(before: macOS 12.0)
   public subscript(index: Int) -> Int {
@@ -66,25 +49,22 @@ public struct TopLevelStruct {
 }
 
 // CHECK: @_backDeploy(before: macOS 12.0)
-// FROMSOURCE: public func backDeployTopLevelFunc1() -> Swift.Int { return 47 }
-// FROMMODULE: public func backDeployTopLevelFunc1() -> Swift.Int
+// CHECK: public func backDeployTopLevelFunc1() -> Swift.Int { return 47 }
 @available(macOS 11.0, *)
 @_backDeploy(before: macOS 12.0)
 public func backDeployTopLevelFunc1() -> Int { return 47 }
 
 // MARK: - Availability macros
 
 // CHECK: @_backDeploy(before: macOS 12.1)
-// FROMSOURCE: public func backDeployTopLevelFunc2() -> Swift.Int { return 48 }
-// FROMMODULE: public func backDeployTopLevelFunc2() -> Swift.Int
+// CHECK: public func backDeployTopLevelFunc2() -> Swift.Int { return 48 }
 @available(macOS 11.0, *)
 @_backDeploy(before: _macOS12_1)
 public func backDeployTopLevelFunc2() -> Int { return 48 }
 
 // CHECK: @_backDeploy(before: macOS 12.1)
 // CHECK: @_backDeploy(before: iOS 15.1)
-// FROMSOURCE: public func backDeployTopLevelFunc3() -> Swift.Int { return 49 }
-// FROMMODULE: public func backDeployTopLevelFunc3() -> Swift.Int
+// CHECK: public func backDeployTopLevelFunc3() -> Swift.Int { return 49 }
 @available(macOS 11.0, iOS 14.0, *)
 @_backDeploy(before: _myProject 1.0)
 public func backDeployTopLevelFunc3() -> Int { return 49 }