Skip to content
Permalink
Browse files
Bump the Swift version to 5.8 (#58931)
* Bump the Swift version to 5.8
  • Loading branch information
shahmishal committed May 16, 2022
1 parent 2f30304 commit f4a1dac792425c44b680c49400b6344567279e8c
Showing 5 changed files with 8 additions and 8 deletions.
@@ -179,7 +179,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.7")
set(SWIFT_VERSION "5.8")

set(SWIFT_VENDOR "" CACHE STRING
"The vendor name of the Swift compiler")
@@ -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"}
// 84346624 == (5 << 24) | (7 << 16) | (7 << 8).
// 5 and 7 is the current major.minor version. 7 is the Swift ABI version.
// CHECK: i32 4, !"Objective-C Garbage Collection", i32 84346624}
// 84412160 == (5 << 24) | (8 << 16) | (7 << 8).
// 5 and 8 is the current major.minor version. 7 is the Swift ABI version.
// CHECK: i32 4, !"Objective-C Garbage Collection", i32 84412160}
// CHECK: i32 1, !"Swift Version", i32 7}
@@ -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.7) 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.7) 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.8) 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.8) because it has requirements that could not be loaded in Swift 4.1.50}}
#else // TEST
@@ -1,5 +1,5 @@
// RUN: %sourcekitd-test -req=compiler-version | %FileCheck %s
// CHECK: key.version_major: 5
// CHECK: key.version_minor: 7
// CHECK: key.version_minor: 8
// CHECK: key.version_patch: 0
@@ -46,7 +46,7 @@
CMAKE_GENERATOR = 'Ninja'

COMPILER_VENDOR = 'none'
SWIFT_USER_VISIBLE_VERSION = Version('5.7')
SWIFT_USER_VISIBLE_VERSION = Version('5.8')
CLANG_USER_VISIBLE_VERSION = Version('13.0.0')
SWIFT_ANALYZE_CODE_COVERAGE = 'false'

0 comments on commit f4a1dac

Please sign in to comment.