Merge pull request #42084 from tshortli/test-maccatalyst-min-inlining

Frontend: Separate macCatalyst `-target-min-inlining-version` floor

Author: tshortli

lib/Basic/Platform.cpp

@@ -84,6 +84,10 @@ swift::minimumAvailableOSVersionForTriple(const llvm::Triple &triple) {
   if (triple.isMacOSX())
     return llvm::VersionTuple(10, 10, 0);
 
+  // Mac Catalyst was introduced with an iOS deployment target of 13.1.
+  if (tripleIsMacCatalystEnvironment(triple))
+    return llvm::VersionTuple(13, 1);
+  
   // Note: this must come before checking iOS since that returns true for
   // both iOS and tvOS.
   if (triple.isTvOS())
@@ -133,6 +137,7 @@ DarwinPlatformKind swift::getDarwinPlatformKind(const llvm::Triple &triple) {
 
     if (tripleIsiOSSimulator(triple))
       return DarwinPlatformKind::IPhoneOSSimulator;
+
     return DarwinPlatformKind::IPhoneOS;
   }
 

test/attr/attr_inlinable_available.swift

@@ -226,7 +226,6 @@ public func deployedUseAfterDeploymentTarget(
 
 //
 // Uses in inlinable functions are based on the minimum inlining target
-// (i.e. the first ABI-stable version, in this case)
 //
 
 @inlinable public func inlinedUseNoAvailable( // expected-note 8 {{add @available attribute}}