Merge pull request #61918 from mikeash/future-version-consistency

Standardize "future" OS versions on 99.99.

Author: mikeash

lib/AST/Availability.cpp

@@ -646,10 +646,10 @@ AvailabilityContext ASTContext::getSwiftFutureAvailability() {
         VersionRange::allGTE(llvm::VersionTuple(99, 99, 0)));
   } else if (target.isiOS()) {
     return AvailabilityContext(
-        VersionRange::allGTE(llvm::VersionTuple(99, 0, 0)));
+        VersionRange::allGTE(llvm::VersionTuple(99, 99, 0)));
   } else if (target.isWatchOS()) {
     return AvailabilityContext(
-        VersionRange::allGTE(llvm::VersionTuple(9, 99, 0)));
+        VersionRange::allGTE(llvm::VersionTuple(99, 99, 0)));
   } else {
     return AvailabilityContext::alwaysAvailable();
   }

test/lit.cfg

@@ -828,10 +828,10 @@ if run_vendor == 'apple':
                                                           next_stable_version, run_environment)
         FUTURE_VERSION = {
             'macosx': '99.99',
-            'ios': '99.0',
+            'ios': '99.99',
             'maccatalyst': '99.99',
-            'tvos': '99.0',
-            'watchos': '9.99.0'
+            'tvos': '99.99',
+            'watchos': '99.99'
         }
         future_version = FUTURE_VERSION.get(run_os, '')
         config.future_triple = '%s-%s-%s%s%s' % (run_cpu, run_vendor, run_os,
@@ -1131,15 +1131,15 @@ if run_vendor == 'apple':
        if run_os == 'ios':
            lit_config.note('Testing iOS ' + config.variant_triple)
            xcrun_sdk_name = "iphoneos"
-           target_future_version = "99.0"
+           target_future_version = "99.99.0"
        elif run_os == 'tvos':
            lit_config.note('Testing AppleTV ' + config.variant_triple)
            xcrun_sdk_name = "appletvos"
-           target_future_version = "99.0"
+           target_future_version = "99.99.0"
        elif run_os == 'watchos':
            lit_config.note('Testing watchOS ' + config.variant_triple)
            xcrun_sdk_name = "watchos"
-           target_future_version = "9.99.0"
+           target_future_version = "99.99.0"
 
        config.target_env_prefix = 'IOS_CHILD_'
 
@@ -1171,17 +1171,17 @@ if run_vendor == 'apple':
             config.available_features.add('DARWIN_SIMULATOR=ios')
             lit_config.note("Testing iOS simulator " + config.variant_triple)
             xcrun_sdk_name = "iphonesimulator"
-            target_future_version = "99.0"
+            target_future_version = "99.99.0"
         elif run_os == 'watchos':
             config.available_features.add('DARWIN_SIMULATOR=watchos')
             lit_config.note("Testing watchOS simulator " + config.variant_triple)
             xcrun_sdk_name = "watchsimulator"
-            target_future_version = "9.99.0"
+            target_future_version = "99.99.0"
         else:
             config.available_features.add('DARWIN_SIMULATOR=tvos')
             lit_config.note("Testing AppleTV simulator " + config.variant_triple)
             xcrun_sdk_name = "appletvsimulator"
-            target_future_version = "99.0"
+            target_future_version = "99.99.0"
 
         target_specific_module_triple += "-simulator"