Skip to content

Commit 6478b5f

Browse files
authored
Merge pull request #67390 from DougGregor/se-0401-feature-rename-5.9
2 parents 8b3938b + f466a46 commit 6478b5f

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

include/swift/Basic/Features.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ UPCOMING_FEATURE(ForwardTrailingClosures, 286, 6)
113113
UPCOMING_FEATURE(BareSlashRegexLiterals, 354, 6)
114114
UPCOMING_FEATURE(ExistentialAny, 335, 6)
115115
UPCOMING_FEATURE(ImportObjcForwardDeclarations, 384, 6)
116-
UPCOMING_FEATURE(DisableActorInferenceFromPropertyWrapperUsage, 0, 6)
116+
UPCOMING_FEATURE(DisableOutwardActorInference, 401, 6)
117117

118118
EXPERIMENTAL_FEATURE(StaticAssert, false)
119119
EXPERIMENTAL_FEATURE(NamedOpaqueTypes, false)

lib/AST/ASTPrinter.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3372,6 +3372,10 @@ static bool usesFeatureBuiltinMacros(Decl *decl) {
33723372
return false;
33733373
}
33743374

3375+
static bool usesFeatureDisableOutwardActorInference(Decl *decl) {
3376+
return false;
3377+
}
3378+
33753379
static bool usesFeatureImportSymbolicCXXDecls(Decl *decl) { return false; }
33763380

33773381
static bool usesFeatureGenerateBindingsForThrowingFunctionsInCXX(Decl *decl) {

lib/Sema/TypeCheckConcurrency.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3682,7 +3682,7 @@ getIsolationFromWrappers(NominalTypeDecl *nominal) {
36823682
return llvm::None;
36833683

36843684
ASTContext &ctx = nominal->getASTContext();
3685-
if (ctx.LangOpts.hasFeature(Feature::DisableActorInferenceFromPropertyWrapperUsage)) {
3685+
if (ctx.LangOpts.hasFeature(Feature::DisableOutwardActorInference)) {
36863686
// In Swift 6, we no longer infer isolation of a nominal type
36873687
// based on the property wrappers used in its stored properties
36883688
return llvm::None;

0 commit comments

Comments
 (0)