Skip to content

Rework the representation and handling of type attributes #71208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 29, 2024
Merged

Rework the representation and handling of type attributes #71208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e345c85
Add some optimized data structures for maps on a small number of
rjmccall Jan 29, 2024
41cdfb0
Introduce a proper TypeAttribute class hierarchy.
rjmccall Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions include/swift/AST/ASTBridging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1213,8 +1213,8 @@ enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedTypeAttrKind : size_t {
SWIFT_NAME("BridgedTypeAttrKind.init(from:)")
BridgedTypeAttrKind BridgedTypeAttrKind_fromString(BridgedStringRef cStr);

SWIFT_NAME("BridgedTypeAttributes.init()")
BridgedTypeAttributes BridgedTypeAttributes_create(void);
SWIFT_NAME("BridgedTypeAttributes.init(context:)")
BridgedTypeAttributes BridgedTypeAttributes_create(BridgedASTContext cContext);

SWIFT_NAME("BridgedTypeAttributes.addSimpleAttr(self:kind:atLoc:attrLoc:)")
void BridgedTypeAttributes_addSimpleAttr(BridgedTypeAttributes cAttributes,
Expand Down Expand Up @@ -1259,10 +1259,9 @@ BridgedArrayTypeRepr BridgedArrayTypeRepr_createParsed(
BridgedSourceLoc cLSquareLoc, BridgedSourceLoc cRSquareLoc);

SWIFT_NAME(
"BridgedAttributedTypeRepr.createParsed(_:base:consumingAttributes:)")
"BridgedAttributedTypeRepr.createParsed(base:consumingAttributes:)")
BridgedAttributedTypeRepr
BridgedAttributedTypeRepr_createParsed(BridgedASTContext cContext,
BridgedTypeRepr base,
BridgedAttributedTypeRepr_createParsed(BridgedTypeRepr base,
BridgedTypeAttributes cAttributes);

SWIFT_NAME("BridgedCompositionTypeRepr.createEmpty(_:anyKeywordLoc:)")
Expand Down
136 changes: 84 additions & 52 deletions include/swift/AST/Attr.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,68 +42,97 @@
DECL_ATTR_ALIAS(SPELLING, CLASS)
#endif

// A type attribute that is both a simple type attribute and a
// SIL type attribute (see below). Delegates to SIL_TYPE_ATTR if that
// is set and SIMPLE_TYPE_ATTR is not; otherwise delegates to SIMPLE_TYPE_ATTR.
#ifndef SIMPLE_SIL_TYPE_ATTR
#ifdef SIL_TYPE_ATTR
#ifdef SIMPLE_TYPE_ATTR
#error ambiguous delegation, must set SIMPLE_SIL_TYPE_ATTR explicitly
#else
#define SIMPLE_SIL_TYPE_ATTR(SPELLING, CLASS) SIL_TYPE_ATTR(SPELLING, CLASS)
#endif
#else
#define SIMPLE_SIL_TYPE_ATTR(SPELLING, CLASS) SIMPLE_TYPE_ATTR(SPELLING, CLASS)
#endif
#endif

// Any kind of type attribute.
#ifndef TYPE_ATTR
#define TYPE_ATTR(X)
#define TYPE_ATTR(SPELLING, CLASS)
#endif

// A type attribute that is only valid in SIL mode. Usually this means
// that it's only valid in lowered types, but sometimes SIL files
// also allow things in formal types that aren't normally expressible.
#ifndef SIL_TYPE_ATTR
#define SIL_TYPE_ATTR(SPELLING, CLASS) TYPE_ATTR(SPELLING, CLASS)
#endif

// A type attribute that's always just spelled `@identifier` in source.
#ifndef SIMPLE_TYPE_ATTR
#define SIMPLE_TYPE_ATTR(SPELLING, CLASS) TYPE_ATTR(SPELLING, CLASS)
#endif


// Type attributes
TYPE_ATTR(autoclosure)
TYPE_ATTR(convention)
TYPE_ATTR(noescape)
TYPE_ATTR(escaping)
TYPE_ATTR(differentiable)
TYPE_ATTR(noDerivative)
TYPE_ATTR(async)
TYPE_ATTR(Sendable)
TYPE_ATTR(retroactive)
TYPE_ATTR(unchecked)
TYPE_ATTR(preconcurrency)
TYPE_ATTR(_local)
TYPE_ATTR(_noMetadata)
TYPE_ATTR(_opaqueReturnTypeOf)
SIMPLE_TYPE_ATTR(autoclosure, Autoclosure)
TYPE_ATTR(convention, Convention)
SIMPLE_TYPE_ATTR(noescape, NoEscape)
SIMPLE_TYPE_ATTR(escaping, Escaping)
TYPE_ATTR(differentiable, Differentiable)
SIMPLE_TYPE_ATTR(noDerivative, NoDerivative)
SIMPLE_TYPE_ATTR(async, Async)
SIMPLE_TYPE_ATTR(Sendable, Sendable)
SIMPLE_TYPE_ATTR(retroactive, Retroactive)
SIMPLE_TYPE_ATTR(unchecked, Unchecked)
SIMPLE_TYPE_ATTR(preconcurrency, Preconcurrency)
SIMPLE_TYPE_ATTR(_local, Local)
SIMPLE_TYPE_ATTR(_noMetadata, NoMetadata)
TYPE_ATTR(_opaqueReturnTypeOf, OpaqueReturnTypeOf)

// SIL-specific attributes
TYPE_ATTR(block_storage)
TYPE_ATTR(box)
TYPE_ATTR(dynamic_self)
#define REF_STORAGE(Name, name, ...) TYPE_ATTR(sil_##name)
SIMPLE_SIL_TYPE_ATTR(block_storage, BlockStorage)
SIMPLE_SIL_TYPE_ATTR(box, Box)
SIMPLE_SIL_TYPE_ATTR(dynamic_self, DynamicSelf)
#define REF_STORAGE(Name, name, ...) SIMPLE_TYPE_ATTR(sil_##name, SIL##Name)
#include "swift/AST/ReferenceStorage.def"
TYPE_ATTR(error)
TYPE_ATTR(error_indirect)
TYPE_ATTR(error_unowned)
TYPE_ATTR(out)
TYPE_ATTR(direct)
TYPE_ATTR(in)
TYPE_ATTR(inout)
TYPE_ATTR(inout_aliasable)
TYPE_ATTR(in_guaranteed)
TYPE_ATTR(in_constant)
TYPE_ATTR(pack_owned)
TYPE_ATTR(pack_guaranteed)
TYPE_ATTR(pack_inout)
TYPE_ATTR(pack_out)
TYPE_ATTR(owned)
TYPE_ATTR(unowned_inner_pointer)
TYPE_ATTR(guaranteed)
TYPE_ATTR(autoreleased)
TYPE_ATTR(callee_owned)
TYPE_ATTR(callee_guaranteed)
TYPE_ATTR(objc_metatype)
TYPE_ATTR(opened)
TYPE_ATTR(pack_element)
TYPE_ATTR(pseudogeneric)
TYPE_ATTR(unimplementable)
TYPE_ATTR(yields)
TYPE_ATTR(yield_once)
TYPE_ATTR(yield_many)
TYPE_ATTR(captures_generics)
SIMPLE_SIL_TYPE_ATTR(error, Error)
SIMPLE_SIL_TYPE_ATTR(error_indirect, ErrorIndirect)
SIMPLE_SIL_TYPE_ATTR(error_unowned, ErrorUnowned)
SIMPLE_SIL_TYPE_ATTR(out, Out)
SIMPLE_SIL_TYPE_ATTR(direct, Direct)
SIMPLE_SIL_TYPE_ATTR(in, In)
SIMPLE_SIL_TYPE_ATTR(inout, Inout)
SIMPLE_SIL_TYPE_ATTR(inout_aliasable, InoutAliasable)
SIMPLE_SIL_TYPE_ATTR(in_guaranteed, InGuaranteed)
SIMPLE_SIL_TYPE_ATTR(in_constant, InConstant)
SIMPLE_SIL_TYPE_ATTR(pack_owned, PackOwned)
SIMPLE_SIL_TYPE_ATTR(pack_guaranteed, PackGuaranteed)
SIMPLE_SIL_TYPE_ATTR(pack_inout, PackInout)
SIMPLE_SIL_TYPE_ATTR(pack_out, PackOut)
SIMPLE_SIL_TYPE_ATTR(owned, Owned)
SIMPLE_SIL_TYPE_ATTR(unowned_inner_pointer, UnownedInnerPointer)
SIMPLE_SIL_TYPE_ATTR(guaranteed, Guaranteed)
SIMPLE_SIL_TYPE_ATTR(autoreleased, Autoreleased)
SIMPLE_SIL_TYPE_ATTR(callee_owned, CalleeOwned)
SIMPLE_SIL_TYPE_ATTR(callee_guaranteed, CalleeGuaranteed)
SIMPLE_SIL_TYPE_ATTR(objc_metatype, ObjCMetatype)
SIL_TYPE_ATTR(opened, Opened)
SIL_TYPE_ATTR(pack_element, PackElement)
SIMPLE_SIL_TYPE_ATTR(pseudogeneric, Pseudogeneric)
SIMPLE_SIL_TYPE_ATTR(unimplementable, Unimplementable)
SIMPLE_SIL_TYPE_ATTR(yields, Yields)
SIMPLE_SIL_TYPE_ATTR(yield_once, YieldOnce)
SIMPLE_SIL_TYPE_ATTR(yield_many, YieldMany)
SIMPLE_SIL_TYPE_ATTR(captures_generics, CapturesGenerics)
// Used at the SIL level to mark a type as moveOnly.
TYPE_ATTR(moveOnly)
TYPE_ATTR(isolated)
SIMPLE_SIL_TYPE_ATTR(moveOnly, MoveOnly)
SIMPLE_SIL_TYPE_ATTR(isolated, Isolated)

// SIL metatype attributes.
TYPE_ATTR(thin)
TYPE_ATTR(thick)
SIMPLE_SIL_TYPE_ATTR(thin, Thin)
SIMPLE_SIL_TYPE_ATTR(thick, Thick)

// Declaration Attributes and Modifers
DECL_ATTR(_silgen_name, SILGenName,
Expand Down Expand Up @@ -548,6 +577,9 @@ SIMPLE_DECL_ATTR(_noObjCBridging, NoObjCBridging,
OnAbstractFunction | OnSubscript | UserInaccessible | ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove,
155)

#undef SIMPLE_SIL_TYPE_ATTR
#undef SIMPLE_TYPE_ATTR
#undef SIL_TYPE_ATTR
#undef TYPE_ATTR
#undef DECL_ATTR_ALIAS
#undef CONTEXTUAL_DECL_ATTR_ALIAS
Expand Down
Loading