Merge pull request #71707 from apple/bump-swift-version-to-6

Update the Swift version to 6.0!

Author: shahmishal

CHANGELOG.md

@@ -3,7 +3,7 @@
 > **Note**\
 > This is in reverse chronological order, so newer entries are added to the top.
 
-## Swift 5.11
+## Swift 6.0
 * [SE-0422][]:
   Non-built-in expression macros can now be used as default arguments that
   expand at each call site. For example, a custom `#CurrentFile` macro used as

cmake/SwiftVersion.cmake

@@ -1,7 +1,7 @@
 # SWIFT_VERSION is deliberately /not/ cached so that an existing build directory
 # can be reused when a new version of Swift comes out (assuming the user hasn't
 # manually set it as part of their own CMake configuration).
-set(SWIFT_VERSION_MAJOR 5)
-set(SWIFT_VERSION_MINOR 11)
+set(SWIFT_VERSION_MAJOR 6)
+set(SWIFT_VERSION_MINOR 0)
 set(SWIFT_VERSION "${SWIFT_VERSION_MAJOR}.${SWIFT_VERSION_MINOR}")
 

docs/ABI/Mangling.rst

@@ -656,7 +656,7 @@ Types
     function-isolation ::= type 'Yc'          // Global actor on function type
   #endif
   throws ::= 'K'                             // 'throws' annotation on function types
-  #if SWIFT_RUNTIME_VERSION >= 5.11
+  #if SWIFT_RUNTIME_VERSION >= 6.0
     throws ::= type 'YK'                     // 'throws(type)' annotation on function types
     function-isolation ::= type 'YA'         // @isolated(any) on function type
   #endif

include/swift/AST/ASTContext.h

@@ -990,10 +990,10 @@ class ASTContext final {
     return getSwiftAvailability(5, 10);
   }
 
-  /// Get the runtime availability of features introduced in the Swift 5.11
+  /// Get the runtime availability of features introduced in the Swift 6.0
   /// compiler for the target platform.
-  inline AvailabilityContext getSwift511Availability() const {
-    return getSwiftAvailability(5, 11);
+  inline AvailabilityContext getSwift60Availability() const {
+    return getSwiftAvailability(6, 0);
   }
 
   /// Get the runtime availability for a particular version of Swift (5.0+).

include/swift/Basic/LangOptions.h

@@ -171,7 +171,7 @@ namespace swift {
     ///
 
     /// User-overridable language version to compile for.
-    version::Version EffectiveLanguageVersion = version::Version::getCurrentLanguageVersion();
+    version::Version EffectiveLanguageVersion = version::Version{5, 10};
 
     /// Swift runtime version to compile for.
     version::Version RuntimeVersion = version::Version::getCurrentLanguageVersion();

include/swift/Demangling/DemangleNodes.def

@@ -361,7 +361,7 @@ NODE(AsyncSuspendResumePartialFunction)
 NODE(AccessibleFunctionRecord)
 NODE(CompileTimeConst)
 
-// Added in Swift 5.11
+// Added in Swift 6.0
 NODE(AccessibleProtocolRequirementFunctionRecord)
 
 // Added in Swift 5.7
@@ -379,7 +379,7 @@ NODE(HasSymbolQuery)
 NODE(OpaqueReturnTypeIndex)
 NODE(OpaqueReturnTypeParent)
 
-// Addedn in Swift 5.11
+// Addedn in Swift 6.0
 NODE(OutlinedEnumTagStore)
 NODE(OutlinedEnumProjectDataForLoad)
 NODE(OutlinedEnumGetTag)

include/swift/Runtime/CMakeConfig.h.in

@@ -7,7 +7,7 @@
 #cmakedefine01 SWIFT_BNI_OS_BUILD
 #cmakedefine01 SWIFT_BNI_XCODE_BUILD
 
-#cmakedefine SWIFT_VERSION_MAJOR "@SWIFT_VERSION_MAJOR@"
-#cmakedefine SWIFT_VERSION_MINOR "@SWIFT_VERSION_MINOR@"
+#define SWIFT_VERSION_MAJOR "@SWIFT_VERSION_MAJOR@"
+#define SWIFT_VERSION_MINOR "@SWIFT_VERSION_MINOR@"
 
 #endif

lib/Basic/Version.cpp

@@ -175,11 +175,11 @@ std::optional<Version> Version::getEffectiveLanguageVersion() const {
     assert(size() == 2 && Components[0] == 4 && Components[1] == 2);
     return Version{4, 2};
   case 5:
-    static_assert(SWIFT_VERSION_MAJOR == 5,
+    return Version{5, 10};
+  case 6:
+    static_assert(SWIFT_VERSION_MAJOR == 6,
                   "getCurrentLanguageVersion is no longer correct here");
     return Version::getCurrentLanguageVersion();
-  case 6:
-    return Version{6};
   default:
     return std::nullopt;
   }

lib/Driver/DarwinToolChains.cpp

@@ -384,8 +384,8 @@ toolchains::Darwin::addArgsToLinkStdlib(ArgStringList &Arguments,
       runtimeCompatibilityVersion = llvm::VersionTuple(5, 6);
     } else if (value.equals("5.8")) {
       runtimeCompatibilityVersion = llvm::VersionTuple(5, 8);
-    } else if (value.equals("5.11")) {
-      runtimeCompatibilityVersion = llvm::VersionTuple(5, 11);
+    } else if (value.equals("6.0")) {
+      runtimeCompatibilityVersion = llvm::VersionTuple(6, 0);
     } else if (value.equals("none")) {
       runtimeCompatibilityVersion = std::nullopt;
     } else {

lib/Frontend/CompilerInvocation.cpp

@@ -2907,8 +2907,8 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
         runtimeCompatibilityVersion = llvm::VersionTuple(5, 6);
       } else if (version.equals("5.8")) {
         runtimeCompatibilityVersion = llvm::VersionTuple(5, 8);
-      } else if (version.equals("5.11")) {
-        runtimeCompatibilityVersion = llvm::VersionTuple(5, 11);
+      } else if (version.equals("6.0")) {
+        runtimeCompatibilityVersion = llvm::VersionTuple(6, 0);
       } else {
         Diags.diagnose(SourceLoc(), diag::error_invalid_arg_value,
                        versionArg->getAsString(Args), version);