From 71cf788ca251dd22ef32c8e1e8957205097f7431 Mon Sep 17 00:00:00 2001
From: Mishal Shah <mishal_shah@apple.com>
Date: Tue, 4 Aug 2020 19:37:23 -0700
Subject: [PATCH] Bump the Swift version to 5.2.5

---
 CMakeLists.txt                                 | 2 +-
 test/Serialization/Recovery/types-5-to-4.swift | 4 ++--
 test/SourceKit/Misc/compiler_version.swift     | 2 +-
 utils/build_swift/defaults.py                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 905e9df461f83..5e3d773ccda90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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.2.4")
+set(SWIFT_VERSION "5.2.5")
 
 set(SWIFT_VENDOR "" CACHE STRING
     "The vendor name of the Swift compiler")
diff --git a/test/Serialization/Recovery/types-5-to-4.swift b/test/Serialization/Recovery/types-5-to-4.swift
index dcc0b278d22ef..369d4f31b212f 100644
--- a/test/Serialization/Recovery/types-5-to-4.swift
+++ b/test/Serialization/Recovery/types-5-to-4.swift
@@ -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.2.4) 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.4) 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.5) 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.5) because it has requirements that could not be loaded in Swift 4.1.50}}
 
 #else // TEST
 
diff --git a/test/SourceKit/Misc/compiler_version.swift b/test/SourceKit/Misc/compiler_version.swift
index eaeb91a2b0224..38e9885281b20 100644
--- a/test/SourceKit/Misc/compiler_version.swift
+++ b/test/SourceKit/Misc/compiler_version.swift
@@ -2,4 +2,4 @@
 
 // CHECK: key.version_major: 5
 // CHECK: key.version_minor: 2
-// CHECK: key.version_patch: 4
+// CHECK: key.version_patch: 5
diff --git a/utils/build_swift/defaults.py b/utils/build_swift/defaults.py
index 63d3288ce40b5..18f08571c740b 100644
--- a/utils/build_swift/defaults.py
+++ b/utils/build_swift/defaults.py
@@ -40,7 +40,7 @@
 CMAKE_GENERATOR = 'Ninja'
 
 COMPILER_VENDOR = 'none'
-SWIFT_USER_VISIBLE_VERSION = CompilerVersion('5.2.4')
+SWIFT_USER_VISIBLE_VERSION = CompilerVersion('5.2.5')
 CLANG_USER_VISIBLE_VERSION = CompilerVersion('7.0.0')
 SWIFT_ANALYZE_CODE_COVERAGE = 'false'