[Driver/Frontend] Add target variant SDK version for Catalyst.

DougGregor · DougGregor · commit 290e9edaf8e9 · 2020-04-15T22:11:11.000-07:00
diff --git a/include/swift/Basic/LangOptions.h b/include/swift/Basic/LangOptions.h
@@ -78,6 +78,9 @@ namespace swift {
     /// The SDK version, if known.
     Optional<llvm::VersionTuple> SDKVersion;
 
+    /// The target variant SDK version, if known.
+    Optional<llvm::VersionTuple> VariantSDKVersion;
+
     ///
     /// Language features
     ///
diff --git a/include/swift/Option/FrontendOptions.td b/include/swift/Option/FrontendOptions.td
@@ -705,4 +705,7 @@ def bridging_header_directory_for_print: Separate<["-"], "bridging-header-direct
 def target_sdk_version : Separate<["-"], "target-sdk-version">,
   HelpText<"The version of target SDK used for compilation">;
 
+def target_variant_sdk_version : Separate<["-"], "target-variant-sdk-version">,
+  HelpText<"The version of target variant SDK used for compilation">;
+
 } // end let Flags = [FrontendOption, NoDriverOption, HelpHidden]
diff --git a/lib/Driver/DarwinToolChains.cpp b/lib/Driver/DarwinToolChains.cpp
@@ -634,6 +634,14 @@ void toolchains::Darwin::addCommonFrontendArgs(
     arguments.push_back("-target-sdk-version");
     arguments.push_back(inputArgs.MakeArgString(sdkVersion->getAsString()));
   }
+
+  if (auto targetVariant = getTargetVariant()) {
+    if (auto variantSDKVersion = getTargetSDKVersion(*targetVariant)) {
+      arguments.push_back("-target-variant-sdk-version");
+      arguments.push_back(
+          inputArgs.MakeArgString(variantSDKVersion->getAsString()));
+    }
+  }
 }
 
 ToolChain::InvocationInfo
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
@@ -606,6 +606,18 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
     }
   }
 
+  // Parse the target variant SDK version.
+  if (Arg *A = Args.getLastArg(options::OPT_target_variant_sdk_version)) {
+    auto vers = version::Version::parseVersionString(
+      A->getValue(), SourceLoc(), &Diags);
+    if (vers.hasValue()) {
+      Opts.VariantSDKVersion = *vers;
+    } else {
+      Diags.diagnose(SourceLoc(), diag::error_invalid_arg_value,
+                     A->getAsString(Args), A->getValue());
+    }
+  }
+
   return HadError || UnsupportedOS || UnsupportedArch;
 }
 
diff --git a/test/Driver/frontend.swift b/test/Driver/frontend.swift
@@ -0,0 +1,4 @@
+// RUN: %swiftc_driver %s -### 2>&1 | %FileCheck %s
+
+// CHECK: swift-frontend
+
diff --git a/test/Driver/macabi-environment.swift b/test/Driver/macabi-environment.swift
@@ -102,14 +102,20 @@
 // SDK version information.
 
 // RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0-macabi -sdk %S/Inputs/MacOSX10.15.versioned.sdk %s 2>&1 | %FileCheck -check-prefix MACOS_10_15_ZIPPERED %s
+// MACOS_10_15_ZIPPERED: -target-sdk-version 10.15
+// MACOS_10_15_ZIPPERED: -target-variant-sdk-version 13.1
 // MACOS_10_15_ZIPPERED: -platform_version macos 10.14.0 10.15.0
 // MACOS_10_15_ZIPPERED: -platform_version mac-catalyst 13.0.0 13.1.0
 
 // RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.14 -target-variant x86_64-apple-ios13.0-macabi -sdk %S/Inputs/MacOSX10.15.4.versioned.sdk %s 2>&1 | %FileCheck -check-prefix MACOS_10_15_4_ZIPPERED %s
+// MACOS_10_15_4_ZIPPERED: -target-sdk-version 10.15.4
+// MACOS_10_15_4_ZIPPERED: -target-variant-sdk-version 13.4
 // MACOS_10_15_4_ZIPPERED: -platform_version macos 10.14.0 10.15.4
 // MACOS_10_15_4_ZIPPERED: -platform_version mac-catalyst 13.0.0 13.4.0
 
 // RUN: %swiftc_driver -driver-print-jobs -target-variant x86_64-apple-macosx10.14 -target x86_64-apple-ios13.0-macabi -sdk %S/Inputs/MacOSX10.15.4.versioned.sdk %s 2>&1 | %FileCheck -check-prefix MACOS_10_15_4_REVERSE_ZIPPERED %s
+// MACOS_10_15_4_REVERSE_ZIPPERED: -target-sdk-version 13.4
+// MACOS_10_15_4_REVERSE_ZIPPERED: -target-variant-sdk-version 10.15.4
 // MACOS_10_15_4_REVERSE_ZIPPERED: -platform_version mac-catalyst 13.0.0 13.4.0
 // MACOS_10_15_4_REVERSE_ZIPPERED: -platform_version macos 10.14.0 10.15.4
 

Original file line number	Diff line number	Diff line change
`@@ -634,6 +634,14 @@ void toolchains::Darwin::addCommonFrontendArgs(`
`634`	`634`	`arguments.push_back("-target-sdk-version");`
`635`	`635`	`arguments.push_back(inputArgs.MakeArgString(sdkVersion->getAsString()));`
`636`	`636`	`}`
	`637`	`+`
	`638`	`+ if (auto targetVariant = getTargetVariant()) {`
	`639`	`+ if (auto variantSDKVersion = getTargetSDKVersion(*targetVariant)) {`
	`640`	`+ arguments.push_back("-target-variant-sdk-version");`
	`641`	`+ arguments.push_back(`
	`642`	`+ inputArgs.MakeArgString(variantSDKVersion->getAsString()));`
	`643`	`+ }`
	`644`	`+ }`
`637`	`645`	`}`
`638`	`646`
`639`	`647`	`ToolChain::InvocationInfo`
Original file line number	Diff line number	Diff line change
`@@ -606,6 +606,18 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,`
`606`	`606`	`}`
`607`	`607`	`}`
`608`	`608`
	`609`	`+ // Parse the target variant SDK version.`
	`610`	`+ if (Arg *A = Args.getLastArg(options::OPT_target_variant_sdk_version)) {`
	`611`	`+ auto vers = version::Version::parseVersionString(`
	`612`	`+ A->getValue(), SourceLoc(), &Diags);`
	`613`	`+ if (vers.hasValue()) {`
	`614`	`+ Opts.VariantSDKVersion = *vers;`
	`615`	`+ } else {`
	`616`	`+ Diags.diagnose(SourceLoc(), diag::error_invalid_arg_value,`
	`617`	`+ A->getAsString(Args), A->getValue());`
	`618`	`+ }`
	`619`	`+ }`
	`620`	`+`
`609`	`621`	`return HadError \|\| UnsupportedOS \|\| UnsupportedArch;`
`610`	`622`	`}`
`611`	`623`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +// RUN: %swiftc_driver %s -### 2>&1 | %FileCheck %s
++
 +// CHECK: swift-frontend
++