Skip to content

Commit adbc49f

Browse files
committed
Revert "[AST] Protect declarations with @_inheritActorContext(always) by a feature flag"
This reverts commit c050e8f.
1 parent d7a6371 commit adbc49f

File tree

3 files changed

+0
-59
lines changed

3 files changed

+0
-59
lines changed

include/swift/Basic/Features.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ LANGUAGE_FEATURE(IsolatedConformances, 407, "Global-actor isolated conformances"
259259
LANGUAGE_FEATURE(ValueGenericsNameLookup, 452, "Value generics appearing as static members for namelookup")
260260
LANGUAGE_FEATURE(GeneralizedIsSameMetaTypeBuiltin, 465, "Builtin.is_same_metatype with support for noncopyable/nonescapable types")
261261
SUPPRESSIBLE_LANGUAGE_FEATURE(ABIAttributeSE0479, 479, "@abi attribute on functions, initializers, properties, and subscripts")
262-
LANGUAGE_FEATURE(AlwaysInheritActorContext, 472, "@_inheritActorContext(always)")
263262

264263
// Swift 6
265264
UPCOMING_FEATURE(ConciseMagicFile, 274, 6)

lib/AST/FeatureSet.cpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -624,21 +624,6 @@ static bool usesFeatureExtensibleAttribute(Decl *decl) {
624624
return decl->getAttrs().hasAttribute<ExtensibleAttr>();
625625
}
626626

627-
static bool usesFeatureAlwaysInheritActorContext(Decl *decl) {
628-
auto *VD = dyn_cast<ValueDecl>(decl);
629-
if (!VD)
630-
return false;
631-
632-
if (auto *PL = VD->getParameterList()) {
633-
return llvm::any_of(*PL, [&](const ParamDecl *P) {
634-
auto *attr = P->getAttrs().getAttribute<InheritActorContextAttr>();
635-
return attr && attr->isAlways();
636-
});
637-
}
638-
639-
return false;
640-
}
641-
642627
// ----------------------------------------------------------------------------
643628
// MARK: - FeatureSet
644629
// ----------------------------------------------------------------------------

test/ModuleInterface/inheritActorContext_attr.swift

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)