Merge pull request #30831 from cyndyishida/tbdv4-switch

[TBDGen] update tbd version

Author: cyndyishida

lib/TBDGen/TBDGen.cpp

@@ -1102,7 +1102,7 @@ GenerateTBDRequest::evaluate(Evaluator &evaluator,
                                 /*forcePublicDecls*/ false);
 
   llvm::MachO::InterfaceFile file;
-  file.setFileType(llvm::MachO::FileType::TBD_V3);
+  file.setFileType(llvm::MachO::FileType::TBD_V4);
   file.setApplicationExtensionSafe(
     isApplicationExtensionSafe(M->getASTContext().LangOpts));
   file.setInstallName(opts.InstallName);

test/TBD/app-extension.swift

@@ -10,6 +10,7 @@
 // NOTEXTENSIONSAFE: not_app_extension_safe
 
 // RUN: %target-swift-frontend -target-variant x86_64-apple-ios13.0-macabi -typecheck %s -application-extension -emit-tbd -emit-tbd-path %t/target-variant.tbd
-// RUN: %FileCheck %s --check-prefix ZIPPERED < %t/target-variant.tbd
+// RUN: %FileCheck %s --check-prefix MACABI < %t/target-variant.tbd
+
+// MACABI: targets: [ {{.*}}macos{{.*}}maccatalyst{{.*}} ]
 
-// ZIPPERED: platform: zippered

test/TBD/arm64e-arch.swift

@@ -2,6 +2,6 @@
 
 public func testSwiftFunc() {}
 
-// CHECK: --- !tapi-tbd-v3
-// CHECK: archs: [ arm64e ]
+// CHECK: --- !tapi-tbd
+// CHECK: arm64e
 // CHECK: symbols: [ '_$s{{.*}}testSwiftFunc{{.*}}' ]