Skip to content

Commit 3cdf178

Browse files
committed
Eliminate DistributedOnly flag on attributes.
Distributed actors are enabled by default, so we don't need this flag any more.
1 parent 05235ed commit 3cdf178

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

include/swift/AST/Attr.def

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,6 @@ SIMPLE_DECL_ATTR(_inheritActorContext, InheritActorContext,
657657

658658
CONTEXTUAL_SIMPLE_DECL_ATTR(distributed, DistributedActor,
659659
DeclModifier | OnClass | OnFunc | OnVar |
660-
DistributedOnly |
661660
ABIBreakingToAdd | ABIBreakingToRemove |
662661
APIBreakingToAdd | APIBreakingToRemove,
663662
118)
@@ -723,7 +722,6 @@ DECL_ATTR(_backDeploy, BackDeploy,
723722

724723
CONTEXTUAL_SIMPLE_DECL_ATTR(_local, KnownToBeLocal,
725724
DeclModifier | OnFunc | OnParam | OnVar |
726-
DistributedOnly |
727725
ABIBreakingToAdd | ABIBreakingToRemove |
728726
APIBreakingToAdd | APIBreakingToRemove,
729727
130)

include/swift/AST/Attr.h

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -287,11 +287,8 @@ class DeclAttribute : public AttributeBase {
287287
/// Whether this attribute is only valid when concurrency is enabled.
288288
ConcurrencyOnly = 1ull << (unsigned(DeclKindIndex::Last_Decl) + 16),
289289

290-
/// Whether this attribute is only valid when distributed is enabled.
291-
DistributedOnly = 1ull << (unsigned(DeclKindIndex::Last_Decl) + 17),
292-
293290
/// Whether this attribute is valid on additional decls in ClangImporter.
294-
OnAnyClangDecl = 1ull << (unsigned(DeclKindIndex::Last_Decl) + 18),
291+
OnAnyClangDecl = 1ull << (unsigned(DeclKindIndex::Last_Decl) + 17),
295292
};
296293

297294
LLVM_READNONE
@@ -386,10 +383,6 @@ class DeclAttribute : public AttributeBase {
386383
return getOptions(DK) & ConcurrencyOnly;
387384
}
388385

389-
static bool isDistributedOnly(DeclAttrKind DK) {
390-
return getOptions(DK) & DistributedOnly;
391-
}
392-
393386
static bool isUserInaccessible(DeclAttrKind DK) {
394387
return getOptions(DK) & UserInaccessible;
395388
}

0 commit comments

Comments
 (0)