From 8b378626e44fe595580dcdbf44873c30fc5401ee Mon Sep 17 00:00:00 2001 From: najacque Date: Thu, 5 Dec 2019 17:22:02 -0800 Subject: [PATCH 1/3] bumping swift version number to 5.2 rdar://problem/56622958 --- CMakeLists.txt | 2 +- test/Serialization/Recovery/types-5-to-4.swift | 4 ++-- utils/build_swift/defaults.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ae8c639c744ee..057d28e220d88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,7 +127,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.1.2") +set(SWIFT_VERSION "5.2") 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 785369188f00a..8b3775cc70b8b 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.1.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.1.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.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.2) because it has requirements that could not be loaded in Swift 4.1.50}} #else // TEST diff --git a/utils/build_swift/defaults.py b/utils/build_swift/defaults.py index a03d866bf57f3..0f9cd122bcd82 100644 --- a/utils/build_swift/defaults.py +++ b/utils/build_swift/defaults.py @@ -40,7 +40,7 @@ CMAKE_GENERATOR = 'Ninja' COMPILER_VENDOR = 'none' -SWIFT_USER_VISIBLE_VERSION = CompilerVersion('5.1.2') +SWIFT_USER_VISIBLE_VERSION = CompilerVersion('5.2') CLANG_USER_VISIBLE_VERSION = CompilerVersion('7.0.0') SWIFT_ANALYZE_CODE_COVERAGE = 'false' From fe35d4af7898009ab14bacfb19426643df5a40f0 Mon Sep 17 00:00:00 2001 From: najacque Date: Fri, 6 Dec 2019 13:51:04 -0800 Subject: [PATCH 2/3] fixing version in test/SourceKit/Misc/compiler_version.swift --- test/SourceKit/Misc/compiler_version.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/SourceKit/Misc/compiler_version.swift b/test/SourceKit/Misc/compiler_version.swift index 12f85500dcf3a..5f067155e4b8c 100644 --- a/test/SourceKit/Misc/compiler_version.swift +++ b/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: 1 -// CHECK: key.version_patch: 2 +// CHECK: key.version_minor: 2 +// CHECK: key.version_patch: 0 From 3ee6e7b04ec84a83a08e981370c11279b717b377 Mon Sep 17 00:00:00 2001 From: najacque Date: Fri, 6 Dec 2019 14:44:44 -0800 Subject: [PATCH 3/3] updated test/IRGen/objc.swift for version bump --- test/IRGen/objc.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/IRGen/objc.swift b/test/IRGen/objc.swift index 190a627f6d50a..424cebccbacab 100644 --- a/test/IRGen/objc.swift +++ b/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"} -// 83953408 == (5 << 24) | (1 << 16) | (7 << 8). -// 5 and 0 is the current major.minor version. 7 is the Swift ABI version. -// CHECK: i32 4, !"Objective-C Garbage Collection", i32 83953408} +// 84018944 == (5 << 24) | (2 << 16) | (7 << 8). +// 5 and 2 is the current major.minor version. 7 is the Swift ABI version. +// CHECK: i32 4, !"Objective-C Garbage Collection", i32 84018944} // CHECK: i32 1, !"Swift Version", i32 7}