Skip to content

Commit 01e5a4e

Browse files
Merge pull request #5051 from swiftwasm/release/5.7
[pull] swiftwasm-release/5.7 from release/5.7
2 parents b48e840 + 3d4a7e6 commit 01e5a4e

File tree

8 files changed

+13
-5
lines changed

8 files changed

+13
-5
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ set(SWIFT_ANALYZE_CODE_COVERAGE FALSE CACHE STRING
179179
# SWIFT_VERSION is deliberately /not/ cached so that an existing build directory
180180
# can be reused when a new version of Swift comes out (assuming the user hasn't
181181
# manually set it as part of their own CMake configuration).
182-
set(SWIFT_VERSION "5.7.1")
182+
set(SWIFT_VERSION "5.7.2")
183183

184184
set(SWIFT_VENDOR "" CACHE STRING
185185
"The vendor name of the Swift compiler")

stdlib/public/BackDeployConcurrency/CheckedContinuation.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ extension CheckedContinuation {
262262
/// - body: A closure that takes a `CheckedContinuation` parameter.
263263
/// You must resume the continuation exactly once.
264264
@available(SwiftStdlib 5.1, *)
265+
@_unsafeInheritExecutor // ABI compatibility with Swift 5.1
265266
public func withCheckedContinuation<T>(
266267
function: String = #function,
267268
_ body: (CheckedContinuation<T, Never>) -> Void
@@ -284,6 +285,7 @@ public func withCheckedContinuation<T>(
284285
/// If `resume(throwing:)` is called on the continuation,
285286
/// this function throws that error.
286287
@available(SwiftStdlib 5.1, *)
288+
@_unsafeInheritExecutor // ABI compatibility with Swift 5.1
287289
public func withCheckedThrowingContinuation<T>(
288290
function: String = #function,
289291
_ body: (CheckedContinuation<T, Error>) -> Void

stdlib/public/BackDeployConcurrency/PartialAsyncTask.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ internal func _resumeUnsafeThrowingContinuationWithError<T>(
254254
///
255255
/// - Returns: The value passed to the continuation by the closure.
256256
@available(SwiftStdlib 5.1, *)
257+
@_unsafeInheritExecutor
257258
@_alwaysEmitIntoClient
258259
public func withUnsafeContinuation<T>(
259260
_ fn: (UnsafeContinuation<T, Never>) -> Void
@@ -274,6 +275,7 @@ public func withUnsafeContinuation<T>(
274275
/// If `resume(throwing:)` is called on the continuation,
275276
/// this function throws that error.
276277
@available(SwiftStdlib 5.1, *)
278+
@_unsafeInheritExecutor
277279
@_alwaysEmitIntoClient
278280
public func withUnsafeThrowingContinuation<T>(
279281
_ fn: (UnsafeContinuation<T, Error>) -> Void

stdlib/public/BackDeployConcurrency/TaskGroup.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ import Swift
6565
/// use the `withThrowingTaskGroup(of:returning:body:)` method instead.
6666
@available(SwiftStdlib 5.1, *)
6767
@_silgen_name("$ss13withTaskGroup2of9returning4bodyq_xm_q_mq_ScGyxGzYaXEtYar0_lF")
68+
@_unsafeInheritExecutor
6869
@inlinable
6970
public func withTaskGroup<ChildTaskResult, GroupResult>(
7071
of childTaskResultType: ChildTaskResult.Type,
@@ -157,6 +158,7 @@ public func withTaskGroup<ChildTaskResult, GroupResult>(
157158
/// or to let the group rethrow the error.
158159
@available(SwiftStdlib 5.1, *)
159160
@_silgen_name("$ss21withThrowingTaskGroup2of9returning4bodyq_xm_q_mq_Scgyxs5Error_pGzYaKXEtYaKr0_lF")
161+
@_unsafeInheritExecutor
160162
@inlinable
161163
public func withThrowingTaskGroup<ChildTaskResult, GroupResult>(
162164
of childTaskResultType: ChildTaskResult.Type,

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

2222
#else // TEST
2323

test/SourceKit/Misc/compiler_version.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
// CHECK: key.version_major: 5
44
// CHECK: key.version_minor: 7
5-
// CHECK: key.version_patch: 1
5+
// CHECK: key.version_patch: 2

utils/build_swift/build_swift/defaults.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
CMAKE_GENERATOR = 'Ninja'
4747

4848
COMPILER_VENDOR = 'none'
49-
SWIFT_USER_VISIBLE_VERSION = Version('5.7.1')
49+
SWIFT_USER_VISIBLE_VERSION = Version('5.7.2')
5050
CLANG_USER_VISIBLE_VERSION = Version('13.0.0')
5151
SWIFT_ANALYZE_CODE_COVERAGE = 'false'
5252

validation-test/IRGen/98995607.swift.gyb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// RUN: %target-run-simple-swiftgyb
22

3+
// REQUIRES: executable_test
4+
35
%for N in range(0, 100):
46

57
protocol P${N}<A, B> {

0 commit comments

Comments
 (0)