Merge pull request #35372 from apple/5.4-bump-version-5.4

Bump the Swift Version to 5.4

Author: shahmishal

CMakeLists.txt

@@ -147,7 +147,7 @@ set(SWIFT_ANALYZE_CODE_COVERAGE FALSE CACHE STRING
 # 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 "5.3")
+set(SWIFT_VERSION "5.4")
 
 set(SWIFT_VENDOR "" CACHE STRING
     "The vendor name of the Swift compiler")

test/IRGen/objc.swift

@@ -145,7 +145,7 @@ class WeakObjC {
 // CHECK:  i32 1, !"Objective-C Version", i32 2}
 // CHECK:  i32 1, !"Objective-C Image Info Version", i32 0}
 // CHECK:  i32 1, !"Objective-C Image Info Section", !"__DATA,__objc_imageinfo,regular,no_dead_strip"}
-//   84084480 == (5 << 24) | (3 << 16) | (7 << 8). 
+//   84150016 == (5 << 24) | (4 << 16) | (7 << 8).
 //     5 and 3 is the current major.minor version. 7 is the Swift ABI version.
-// CHECK:  i32 4, !"Objective-C Garbage Collection", i32 84084480}
+// CHECK:  i32 4, !"Objective-C Garbage Collection", i32 84150016}
 // CHECK:  i32 1, !"Swift Version", i32 7}

test/Serialization/Recovery/types-5-to-4.swift

@@ -16,8 +16,8 @@ import Lib
 func requiresConformance(_: B_RequiresConformance<B_ConformsToProto>) {}
 func requiresConformance(_: B_RequiresConformance<C_RelyOnConformanceImpl.Assoc>) {}
 
-class Sub: Base {} // expected-error {{cannot inherit from class 'Base' (compiled with Swift 5.3) because it has overridable members that could not be loaded in Swift 4.1.50}}
-class Impl: Proto {} // expected-error {{type 'Impl' cannot conform to protocol 'Proto' (compiled with Swift 5.3) because it has requirements that could not be loaded in Swift 4.1.50}}
+class Sub: Base {} // expected-error {{cannot inherit from class 'Base' (compiled with Swift 5.4) because it has overridable members that could not be loaded in Swift 4.1.50}}
+class Impl: Proto {} // expected-error {{type 'Impl' cannot conform to protocol 'Proto' (compiled with Swift 5.4) because it has requirements that could not be loaded in Swift 4.1.50}}
 
 #else // TEST
 

test/SourceKit/Misc/compiler_version.swift

@@ -1,5 +1,5 @@
 // RUN: %sourcekitd-test -req=compiler-version | %FileCheck %s
 
 // CHECK: key.version_major: 5
-// CHECK: key.version_minor: 3
+// CHECK: key.version_minor: 4
 // CHECK: key.version_patch: 0

utils/build_swift/build_swift/defaults.py

@@ -49,7 +49,7 @@
 CMAKE_GENERATOR = 'Ninja'
 
 COMPILER_VENDOR = 'none'
-SWIFT_USER_VISIBLE_VERSION = Version('5.3')
+SWIFT_USER_VISIBLE_VERSION = Version('5.4')
 CLANG_USER_VISIBLE_VERSION = Version('10.0.0')
 SWIFT_ANALYZE_CODE_COVERAGE = 'false'