Merge pull request swiftlang#27736 from harlanhaskins/installwizard

[TBDGen] Use TAPI's defaults for compatibility_version and current_version

Author: Harlan Haskins

include/swift/TBDGen/TBDGen.h

@@ -40,14 +40,12 @@ struct TBDGenOptions {
   std::string ModuleLinkName;
 
   /// The current project version to use in the generated TBD file. Defaults
-  /// to 1, which matches the default if the DYLIB_CURRENT_VERSION build setting
-  /// is not set.
-  version::Version CurrentVersion = {1, 0, 0};
+  /// to None.
+  llvm::Optional<version::Version> CurrentVersion = None;
 
   /// The dylib compatibility-version to use in the generated TBD file. Defaults
-  /// to 1, which matches the default if the DYLIB_COMPATIBILITY_VERSION build
-  /// setting is not set.
-  version::Version CompatibilityVersion = {1, 0, 0};
+  /// to None.
+  llvm::Optional<version::Version> CompatibilityVersion = None;
 };
 
 void enumeratePublicSymbols(FileUnit *module, llvm::StringSet<> &symbols,

lib/TBDGen/TBDGen.cpp

@@ -34,6 +34,7 @@
 #include "swift/SIL/TypeLowering.h"
 #include "llvm/ADT/StringSet.h"
 #include "llvm/Support/Error.h"
+#include "llvm/Support/Process.h"
 #include "llvm/Support/YAMLTraits.h"
 #include "llvm/TextAPI/MachO/InterfaceFile.h"
 #include "llvm/TextAPI/MachO/TextAPIReader.h"
@@ -597,7 +598,10 @@ convertToPacked(const version::Version &version) {
 }
 
 static bool isApplicationExtensionSafe(const LangOptions &LangOpts) {
-  return LangOpts.EnableAppExtensionRestrictions;
+  // Existing linkers respect these flags to determine app extension safety.
+  return LangOpts.EnableAppExtensionRestrictions ||
+         llvm::sys::Process::GetEnv("LD_NO_ENCRYPT") ||
+         llvm::sys::Process::GetEnv("LD_APPLICATION_EXTENSION_SAFE");
 }
 
 static void enumeratePublicSymbolsAndWrite(ModuleDecl *M, FileUnit *singleFile,
@@ -615,8 +619,12 @@ static void enumeratePublicSymbolsAndWrite(ModuleDecl *M, FileUnit *singleFile,
   file.setApplicationExtensionSafe(
     isApplicationExtensionSafe(M->getASTContext().LangOpts));
   file.setInstallName(opts.InstallName);
-  file.setCurrentVersion(convertToPacked(opts.CurrentVersion));
-  file.setCompatibilityVersion(convertToPacked(opts.CompatibilityVersion));
+  if (auto currentVersion = opts.CurrentVersion) {
+    file.setCurrentVersion(convertToPacked(*currentVersion));
+  }
+  if (auto compatibilityVersion = opts.CompatibilityVersion) {
+    file.setCompatibilityVersion(convertToPacked(*compatibilityVersion));
+  }
   file.setTwoLevelNamespace();
   file.setSwiftABIVersion(irgen::getSwiftABIVersion());
   file.setInstallAPI(opts.IsInstallAPI);

test/TBD/dylib-version.swift

@@ -12,16 +12,6 @@
 // BOTH: current-version: 2.0.3
 // BOTH: compatibility-version: 1.7
 // CURRENT: current-version: 2
-
-// Compatibility version defaults to 1 if not present in TBD file, and
-// tapi does not write field if compatibility version is 1
-
-// CURRENT-NOT: compatibility-version: 1
-
 // COMPAT: compatibility-version: 2
 
-// Same as above -- current version defaults to 1 and is not present in
-// emitted TBD file if it's 1.
-// COMPAT-NOT: current-version: 1
-
 // BOGUS: version component contains non-numeric characters