From 78784a6b1a6b4757ca96c5a58b8801b675c9d8b5 Mon Sep 17 00:00:00 2001 From: Mishal Shah Date: Wed, 26 Jan 2022 17:33:37 -0800 Subject: [PATCH] Bump the Swift version to 5.5.3 --- CMakeLists.txt | 2 +- test/Serialization/Recovery/types-5-to-4.swift | 4 ++-- test/SourceKit/Misc/compiler_version.swift | 2 +- utils/build_swift/build_swift/defaults.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 130ffc9ba3a11..7a3cc3af07a4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -148,7 +148,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.5.2") +set(SWIFT_VERSION "5.5.3") set(SWIFT_VENDOR "" CACHE STRING "The vendor name of the Swift compiler") diff --git a/test/Serialization/Recovery/types-5-to-4.swift b/test/Serialization/Recovery/types-5-to-4.swift index 28de068026c21..d953529e142e6 100644 --- a/test/Serialization/Recovery/types-5-to-4.swift +++ b/test/Serialization/Recovery/types-5-to-4.swift @@ -16,8 +16,8 @@ import Lib func requiresConformance(_: B_RequiresConformance) {} func requiresConformance(_: B_RequiresConformance) {} -class Sub: Base {} // expected-error {{cannot inherit from class 'Base' (compiled with Swift 5.5.2) 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.5.2) 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.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.5.3) because it has requirements that could not be loaded in Swift 4.1.50}} #else // TEST diff --git a/test/SourceKit/Misc/compiler_version.swift b/test/SourceKit/Misc/compiler_version.swift index 4172fc033c25b..a618c478cb9a4 100644 --- a/test/SourceKit/Misc/compiler_version.swift +++ b/test/SourceKit/Misc/compiler_version.swift @@ -2,4 +2,4 @@ // CHECK: key.version_major: 5 // CHECK: key.version_minor: 5 -// CHECK: key.version_patch: 2 +// CHECK: key.version_patch: 3 diff --git a/utils/build_swift/build_swift/defaults.py b/utils/build_swift/build_swift/defaults.py index d8cc32ed69b41..3a22acab2a6dd 100644 --- a/utils/build_swift/build_swift/defaults.py +++ b/utils/build_swift/build_swift/defaults.py @@ -49,7 +49,7 @@ CMAKE_GENERATOR = 'Ninja' COMPILER_VENDOR = 'none' -SWIFT_USER_VISIBLE_VERSION = Version('5.5.2') +SWIFT_USER_VISIBLE_VERSION = Version('5.5.3') CLANG_USER_VISIBLE_VERSION = Version('10.0.0') SWIFT_ANALYZE_CODE_COVERAGE = 'false'