From f28fe654fce7b0e0ba95f03f59ceae939aca847b Mon Sep 17 00:00:00 2001 From: mishal_shah Date: Thu, 26 Apr 2018 18:22:07 -0700 Subject: [PATCH] Update the swift version to 4.1.1 --- CMakeLists.txt | 2 +- test/Serialization/Recovery/crash-recovery.swift | 2 +- test/Serialization/Recovery/types-4-to-3.swift | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 112b5d630d234..1a9e231def1bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,7 +119,7 @@ set_property(CACHE SWIFT_ANALYZE_CODE_COVERAGE PROPERTY # 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 "4.1") +set(SWIFT_VERSION "4.1.1") set(SWIFT_VENDOR "" CACHE STRING "The vendor name of the Swift compiler") diff --git a/test/Serialization/Recovery/crash-recovery.swift b/test/Serialization/Recovery/crash-recovery.swift index aecd4d26e3b3a..9e6e93746de7d 100644 --- a/test/Serialization/Recovery/crash-recovery.swift +++ b/test/Serialization/Recovery/crash-recovery.swift @@ -14,7 +14,7 @@ public class Sub: Base { // CHECK-CRASH: error: fatal error encountered while reading from module 'Lib'; please file a bug report with your project and the crash log // CHECK-CRASH-3-NOT: note -// CHECK-CRASH-4: note: compiling as Swift 4.1, with 'Lib' built as Swift 3.3 +// CHECK-CRASH-4: note: compiling as Swift 4.1.1, with 'Lib' built as Swift 3.3 // CHECK-CRASH-LABEL: *** DESERIALIZATION FAILURE (please include this section in any bug report) *** // CHECK-CRASH: could not find 'disappearingMethod()' in parent class // CHECK-CRASH: While loading members for 'Sub' in module 'Lib' diff --git a/test/Serialization/Recovery/types-4-to-3.swift b/test/Serialization/Recovery/types-4-to-3.swift index 380c3d097977a..0b4952515426d 100644 --- a/test/Serialization/Recovery/types-4-to-3.swift +++ b/test/Serialization/Recovery/types-4-to-3.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 4.1) because it has overridable members that could not be loaded in Swift 3.3}} -class Impl: Proto {} // expected-error {{type 'Impl' cannot conform to protocol 'Proto' (compiled with Swift 4.1) because it has requirements that could not be loaded in Swift 3.3}} +class Sub: Base {} // expected-error {{cannot inherit from class 'Base' (compiled with Swift 4.1.1) because it has overridable members that could not be loaded in Swift 3.3}} +class Impl: Proto {} // expected-error {{type 'Impl' cannot conform to protocol 'Proto' (compiled with Swift 4.1.1) because it has requirements that could not be loaded in Swift 3.3}} #else // TEST