Skip to content

Commit f17b7e2

Browse files
authored
Merge pull request #36463 from tkremenek/swift-5.5-version-bump
Update Swift version to 5.5
2 parents 5e68204 + 8256a4e commit f17b7e2

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ set(SWIFT_ANALYZE_CODE_COVERAGE FALSE CACHE STRING
148148
# SWIFT_VERSION is deliberately /not/ cached so that an existing build directory
149149
# can be reused when a new version of Swift comes out (assuming the user hasn't
150150
# manually set it as part of their own CMake configuration).
151-
set(SWIFT_VERSION "5.4")
151+
set(SWIFT_VERSION "5.5")
152152

153153
set(SWIFT_VENDOR "" CACHE STRING
154154
"The vendor name of the Swift compiler")

test/IRGen/objc.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class WeakObjC {
145145
// CHECK: i32 1, !"Objective-C Version", i32 2}
146146
// CHECK: i32 1, !"Objective-C Image Info Version", i32 0}
147147
// CHECK: i32 1, !"Objective-C Image Info Section", !"__DATA,__objc_imageinfo,regular,no_dead_strip"}
148-
// 84150016 == (5 << 24) | (4 << 16) | (7 << 8).
149-
// 5 and 3 is the current major.minor version. 7 is the Swift ABI version.
150-
// CHECK: i32 4, !"Objective-C Garbage Collection", i32 84150016}
148+
// 84215552 == (5 << 24) | (5 << 16) | (7 << 8).
149+
// 5 and 5 is the current major.minor version. 7 is the Swift ABI version.
150+
// CHECK: i32 4, !"Objective-C Garbage Collection", i32 84215552}
151151
// CHECK: i32 1, !"Swift Version", i32 7}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import Lib
1616
func requiresConformance(_: B_RequiresConformance<B_ConformsToProto>) {}
1717
func requiresConformance(_: B_RequiresConformance<C_RelyOnConformanceImpl.Assoc>) {}
1818

19-
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}}
20-
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}}
19+
class Sub: Base {} // expected-error {{cannot inherit from class 'Base' (compiled with Swift 5.5) because it has overridable members that could not be loaded in Swift 4.1.50}}
20+
class Impl: Proto {} // expected-error {{type 'Impl' cannot conform to protocol 'Proto' (compiled with Swift 5.5) because it has requirements that could not be loaded in Swift 4.1.50}}
2121

2222
#else // TEST
2323

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %sourcekitd-test -req=compiler-version | %FileCheck %s
22

33
// CHECK: key.version_major: 5
4-
// CHECK: key.version_minor: 4
4+
// CHECK: key.version_minor: 5
55
// CHECK: key.version_patch: 0

utils/build_swift/build_swift/defaults.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
CMAKE_GENERATOR = 'Ninja'
5050

5151
COMPILER_VENDOR = 'none'
52-
SWIFT_USER_VISIBLE_VERSION = Version('5.4')
52+
SWIFT_USER_VISIBLE_VERSION = Version('5.5')
5353
CLANG_USER_VISIBLE_VERSION = Version('10.0.0')
5454
SWIFT_ANALYZE_CODE_COVERAGE = 'false'
5555

0 commit comments

Comments
 (0)