Skip to content

Commit 60c5ef5

Browse files
author
najacque
committed
bumping Swift version from 4.2 to 4.2.1 rdar://problem/43124673
1 parent de88335 commit 60c5ef5

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ set_property(CACHE SWIFT_ANALYZE_CODE_COVERAGE PROPERTY
128128
# SWIFT_VERSION is deliberately /not/ cached so that an existing build directory
129129
# can be reused when a new version of Swift comes out (assuming the user hasn't
130130
# manually set it as part of their own CMake configuration).
131-
set(SWIFT_VERSION "4.2")
131+
set(SWIFT_VERSION "4.2.1")
132132

133133
set(SWIFT_VENDOR "" CACHE STRING
134134
"The vendor name of the Swift compiler")

test/Serialization/Recovery/crash-recovery.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class Sub: Base {
1414

1515
// CHECK-CRASH: error: fatal error encountered while reading from module 'Lib'; please file a bug report with your project and the crash log
1616
// CHECK-CRASH-3-NOT: note
17-
// CHECK-CRASH-4: note: compiling as Swift 4.2, with 'Lib' built as Swift 3.4
17+
// CHECK-CRASH-4: note: compiling as Swift 4.2.1, with 'Lib' built as Swift 3.4
1818
// CHECK-CRASH-LABEL: *** DESERIALIZATION FAILURE (please include this section in any bug report) ***
1919
// CHECK-CRASH: could not find 'disappearingMethod()' in parent class
2020
// CHECK-CRASH: While loading members for 'Sub' in module 'Lib'

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

2222
#else // TEST
2323

0 commit comments

Comments
 (0)