Merge pull request #21642 from kevints/swift-4.2.1-branch

Bump SWIFT_VERSION to 4.2.2

Author: shahmishal

CMakeLists.txt

@@ -128,7 +128,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.2.1")
+set(SWIFT_VERSION "4.2.2")
 
 set(SWIFT_VENDOR "" CACHE STRING
     "The vendor name of the Swift compiler")

test/Parse/ConditionalCompilation/language_version_explicit.swift

@@ -22,15 +22,15 @@
 #endif
 
 // NOTE: Please modify this condition...
-#if swift(>=4.2.1)
+#if swift(>=4.2.2)
   let b = 1
 #else
   // This shouldn't emit any diagnostics.
   asdf asdf asdf asdf
 #endif
 
 // NOTE: ...and modify this condition...
-#if swift(>=4.2.2)
+#if swift(>=4.2.3)
   // This shouldn't emit any diagnostics.
   asdf asdf asdf asdf
 #else

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.2.1, with 'Lib' built as Swift 3.4
+// CHECK-CRASH-4: note: compiling as Swift 4.2.2, 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'