Skip to content

Commit ec4edaf

Browse files
rintarorintaro
committed
[ASTGen] Introduce 'AvailableAttr::createUnavailableInEmbedded()'
1 parent d978d53 commit ec4edaf

File tree

7 files changed

+38
-53
lines changed

7 files changed

+38
-53
lines changed

‎include/swift/AST/ASTBridging.h

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -810,23 +810,10 @@ enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedAvailableAttrKind {
810810
BridgedAvailableAttrKindNoAsync,
811811
};
812812

813-
SWIFT_NAME(
814-
"BridgedAvailableAttr.createParsed(_:atLoc:range:domain:domainLoc:kind:message:"
815-
"renamed:introduced:introducedRange:deprecated:deprecatedRange:"
816-
"obsoleted:obsoletedRange:)")
817-
BridgedAvailableAttr BridgedAvailableAttr_createParsed(
818-
BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
819-
BridgedSourceRange cRange, BridgedAvailabilityDomain cDomain, BridgedSourceLoc cDomainLoc,
820-
BridgedAvailableAttrKind cKind, BridgedStringRef cMessage,
821-
BridgedStringRef cRenamed, BridgedVersionTuple cIntroduced,
822-
BridgedSourceRange cIntroducedRange, BridgedVersionTuple cDeprecated,
823-
BridgedSourceRange cDeprecatedRange, BridgedVersionTuple cObsoleted,
824-
BridgedSourceRange cObsoletedRange);
825-
826813
SWIFT_NAME("BridgedAvailableAttr.createParsed(_:atLoc:range:domainIdentifier:"
827814
"domainLoc:kind:message:renamed:introduced:introducedRange:"
828815
"deprecated:deprecatedRange:obsoleted:obsoletedRange:)")
829-
BridgedAvailableAttr BridgedAvailableAttr_createParsedIdentifier(
816+
BridgedAvailableAttr BridgedAvailableAttr_createParsed(
830817
BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
831818
BridgedSourceRange cRange, BridgedIdentifier cDomainIdentifier,
832819
BridgedSourceLoc cDomainLoc, BridgedAvailableAttrKind cKind,
@@ -835,6 +822,12 @@ BridgedAvailableAttr BridgedAvailableAttr_createParsedIdentifier(
835822
BridgedVersionTuple cDeprecated, BridgedSourceRange cDeprecatedRange,
836823
BridgedVersionTuple cObsoleted, BridgedSourceRange cObsoletedRange);
837824

825+
SWIFT_NAME("BridgedAvailableAttr.createUnavailableInEmbedded(_:atLoc:range:)")
826+
BridgedAvailableAttr
827+
BridgedAvailableAttr_createUnavailableInEmbedded(BridgedASTContext cContext,
828+
BridgedSourceLoc cAtLoc,
829+
BridgedSourceRange cRange);
830+
838831
SWIFT_NAME("BridgedAvailableAttr.setIsGroupMember(self:)")
839832
void BridgedAvailableAttr_setIsGroupMember(BridgedAvailableAttr cAttr);
840833
SWIFT_NAME("BridgedAvailableAttr.setIsGroupedWithWildcard(self:)")

‎include/swift/AST/Attr.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -888,6 +888,11 @@ class AvailableAttr : public DeclAttribute {
888888
llvm::VersionTuple Introduced, llvm::VersionTuple Deprecated,
889889
llvm::VersionTuple Obsoleted);
890890

891+
/// Create an `AvailableAttr` for `@_unavailableInEmbedded`.
892+
static AvailableAttr *createUnavailableInEmbedded(ASTContext &ctx,
893+
SourceLoc AtLoc,
894+
SourceRange Range);
895+
891896
AvailableAttr *clone(ASTContext &C, bool implicit) const;
892897
AvailableAttr *clone(ASTContext &C) const {
893898
return clone(C, isImplicit());

‎lib/AST/Attr.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2208,6 +2208,19 @@ AvailableAttr *AvailableAttr::createPlatformVersioned(
22082208
/*SPI=*/false);
22092209
}
22102210

2211+
AvailableAttr *AvailableAttr::createUnavailableInEmbedded(ASTContext &C,
2212+
SourceLoc AtLoc,
2213+
SourceRange Range) {
2214+
return new (C) AvailableAttr(
2215+
AtLoc, Range, AvailabilityDomain::forEmbedded(), SourceLoc(),
2216+
AvailableAttr::Kind::Unavailable, "unavailable in embedded Swift",
2217+
/*Rename=*/StringRef(),
2218+
/*Introduced=*/llvm::VersionTuple(), /*IntroducedRange=*/{},
2219+
/*Deprecated=*/llvm::VersionTuple(), /*DeprecatedRange=*/{},
2220+
/*Obsoleted=*/llvm::VersionTuple(), /*ObsoletedRange=*/{},
2221+
/*Implicit=*/false, /*IsSPI=*/false);
2222+
}
2223+
22112224
bool BackDeployedAttr::isActivePlatform(const ASTContext &ctx,
22122225
bool forTargetVariant) const {
22132226
return isPlatformActive(Platform, ctx.LangOpts, forTargetVariant);

‎lib/AST/Bridging/DeclAttributeBridging.cpp

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -95,25 +95,6 @@ static AvailableAttr::Kind unbridge(BridgedAvailableAttrKind value) {
9595
}
9696

9797
BridgedAvailableAttr BridgedAvailableAttr_createParsed(
98-
BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
99-
BridgedSourceRange cRange, BridgedAvailabilityDomain cDomain,
100-
BridgedSourceLoc cDomainLoc, BridgedAvailableAttrKind cKind,
101-
BridgedStringRef cMessage, BridgedStringRef cRenamed,
102-
BridgedVersionTuple cIntroduced, BridgedSourceRange cIntroducedRange,
103-
BridgedVersionTuple cDeprecated, BridgedSourceRange cDeprecatedRange,
104-
BridgedVersionTuple cObsoleted, BridgedSourceRange cObsoletedRange) {
105-
return new (cContext.unbridged())
106-
AvailableAttr(cAtLoc.unbridged(), cRange.unbridged(), cDomain.unbridged(),
107-
cDomainLoc.unbridged(), unbridge(cKind),
108-
cMessage.unbridged(), cRenamed.unbridged(),
109-
cIntroduced.unbridged(), cIntroducedRange.unbridged(),
110-
cDeprecated.unbridged(), cDeprecatedRange.unbridged(),
111-
cObsoleted.unbridged(), cObsoletedRange.unbridged(),
112-
/*Implicit=*/false,
113-
/*IsSPI=*/false);
114-
}
115-
116-
BridgedAvailableAttr BridgedAvailableAttr_createParsedIdentifier(
11798
BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
11899
BridgedSourceRange cRange, BridgedIdentifier cDomainIdentifier,
119100
BridgedSourceLoc cDomainLoc, BridgedAvailableAttrKind cKind,
@@ -133,6 +114,14 @@ BridgedAvailableAttr BridgedAvailableAttr_createParsedIdentifier(
133114
/*IsSPI=*/false);
134115
}
135116

117+
BridgedAvailableAttr
118+
BridgedAvailableAttr_createUnavailableInEmbedded(BridgedASTContext cContext,
119+
BridgedSourceLoc cAtLoc,
120+
BridgedSourceRange cRange) {
121+
return AvailableAttr::createUnavailableInEmbedded(
122+
cContext.unbridged(), cAtLoc.unbridged(), cRange.unbridged());
123+
}
124+
136125
void BridgedAvailableAttr_setIsGroupMember(BridgedAvailableAttr cAttr) {
137126
cAttr.unbridged()->setIsGroupMember();
138127
}

‎lib/ASTGen/Sources/ASTGen/Availability.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ extension ASTGenVisitor {
311311
if !expanded.isEmpty {
312312
expanded.withElements(ofType: UnsafeRawPointer.self) { buffer in
313313
for ptr in buffer {
314+
// TODO: Clone and spec.setMacroLoc().
314315
result.append(BridgedAvailabilitySpec(raw: UnsafeMutableRawPointer(mutating: ptr)))
315316
}
316317
}

‎lib/ASTGen/Sources/ASTGen/DeclAttrs.swift

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1919,21 +1919,10 @@ extension ASTGenVisitor {
19191919

19201920
func generateUnavailableInEmbeddedAttr(attribute node: AttributeSyntax) -> BridgedAvailableAttr? {
19211921
if ctx.langOptsHasFeature(.Embedded) {
1922-
return BridgedAvailableAttr.createParsed(
1922+
return BridgedAvailableAttr.createUnavailableInEmbedded(
19231923
self.ctx,
19241924
atLoc: self.generateSourceLoc(node.atSign),
1925-
range: self.generateAttrSourceRange(node),
1926-
domain: .forEmbedded(),
1927-
domainLoc: nil,
1928-
kind: .unavailable,
1929-
message: "unavailable in embedded Swift",
1930-
renamed: "",
1931-
introduced: BridgedVersionTuple(),
1932-
introducedRange: BridgedSourceRange(),
1933-
deprecated: BridgedVersionTuple(),
1934-
deprecatedRange: BridgedSourceRange(),
1935-
obsoleted: BridgedVersionTuple(),
1936-
obsoletedRange: BridgedSourceRange()
1925+
range: self.generateAttrSourceRange(node)
19371926
)
19381927
} else {
19391928
// For non-Embedded mode, ignore it.

‎lib/Parse/ParseDecl.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4299,13 +4299,8 @@ ParserStatus Parser::parseDeclAttribute(DeclAttributes &Attributes,
42994299
if (!DK && Tok.getText() == UNAVAILABLE_IN_EMBEDDED_ATTRNAME) {
43004300
SourceLoc attrLoc = consumeToken();
43014301
if (Context.LangOpts.hasFeature(Feature::Embedded)) {
4302-
StringRef Message = "unavailable in embedded Swift", Renamed;
4303-
auto attr = new (Context) AvailableAttr(
4304-
AtLoc, SourceRange(AtLoc, attrLoc), AvailabilityDomain::forEmbedded(),
4305-
SourceLoc(), AvailableAttr::Kind::Unavailable, Message, Renamed,
4306-
llvm::VersionTuple(), SourceRange(), llvm::VersionTuple(),
4307-
SourceRange(), llvm::VersionTuple(), SourceRange(),
4308-
/*Implicit=*/false, /*IsSPI=*/false);
4302+
auto attr = AvailableAttr::createUnavailableInEmbedded(
4303+
Context, AtLoc, SourceRange(AtLoc, attrLoc));
43094304
Attributes.add(attr);
43104305
}
43114306
return makeParserSuccess();

0 commit comments

Comments
 (0)