Skip to content

Commit e24988e

Browse files
committed
Merge remote-tracking branch 'origin/main' into rebranch
2 parents 76ff2c1 + 2eade1d commit e24988e

File tree

7 files changed

+297
-71
lines changed

7 files changed

+297
-71
lines changed

include/swift/Basic/Features.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ EXPERIMENTAL_FEATURE(BuiltinModule, true)
218218
EXPERIMENTAL_FEATURE(StrictConcurrency, true)
219219

220220
/// Defer Sendable checking to SIL diagnostic phase.
221-
EXPERIMENTAL_FEATURE(DeferredSendableChecking, false)
221+
EXPERIMENTAL_FEATURE(SendNonSendable, false)
222222

223223
/// Enable extended callbacks (with additional parameters) to be used when the
224224
/// "playground transform" is enabled.

include/swift/SILOptimizer/Utils/PartitionUtils.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ enum class PartitionOpKind : uint8_t {
5454
// Assign one value to a fresh region, takes one arg.
5555
AssignFresh,
5656

57-
// Consume the region of a value, takes one arg. Region of arg must be
58-
// non-consumed before the op.
57+
// Consume the region of a value if not already consumed, takes one arg.
5958
Consume,
6059

6160
// Merge the regions of two values, takes two args, both must be from

lib/AST/ASTPrinter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3480,7 +3480,7 @@ static bool usesFeatureParameterPacks(Decl *decl) {
34803480
return false;
34813481
}
34823482

3483-
static bool usesFeatureDeferredSendableChecking(Decl *decl) {
3483+
static bool usesFeatureSendNonSendable(Decl *decl) {
34843484
return false;
34853485
}
34863486

0 commit comments

Comments
 (0)