Merge pull request #18852 from najacque/swift-4.2-branch
bumping Swift version from 4.2 to 4.2.1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d75fbbe..18fd811 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,7 +128,7 @@
# 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.2")
+set(SWIFT_VERSION "4.2.1")
set(SWIFT_VENDOR "" CACHE STRING
"The vendor name of the Swift compiler")
diff --git a/test/Parse/ConditionalCompilation/language_version_explicit.swift b/test/Parse/ConditionalCompilation/language_version_explicit.swift
index a76963c..e3f2731 100644
--- a/test/Parse/ConditionalCompilation/language_version_explicit.swift
+++ b/test/Parse/ConditionalCompilation/language_version_explicit.swift
@@ -22,7 +22,7 @@
#endif
// NOTE: Please modify this condition...
-#if swift(>=4.2)
+#if swift(>=4.2.1)
let b = 1
#else
// This shouldn't emit any diagnostics.
@@ -30,7 +30,7 @@
#endif
// NOTE: ...and modify this condition...
-#if swift(>=4.2.1)
+#if swift(>=4.2.2)
// This shouldn't emit any diagnostics.
asdf asdf asdf asdf
#else
diff --git a/test/Serialization/Recovery/crash-recovery.swift b/test/Serialization/Recovery/crash-recovery.swift
index c110d97..ce96618 100644
--- a/test/Serialization/Recovery/crash-recovery.swift
+++ b/test/Serialization/Recovery/crash-recovery.swift
@@ -14,7 +14,7 @@
// 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.2, with 'Lib' built as Swift 3.4
+// CHECK-CRASH-4: note: compiling as Swift 4.2.1, with 'Lib' built as Swift 3.4
// 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'
