bumping swift version number to 5.2 rdar://problem/56622958

This commit is contained in:
najacque 2019-12-05 17:22:02 -08:00
Родитель 7485716d4b
Коммит 8b378626e4
3 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -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")

Просмотреть файл

@ -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.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

Просмотреть файл

@ -40,7 +40,7 @@ BUILD_VARIANT = 'Debug'
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'