Skip to content

Commit fc7389f

Browse files
meg-guptameg-gupta
authored
Merge pull request #72625 from meg-gupta/cpdependson
[6.0] Update lifetime dependence syntax and inference
2 parents 37a46a6 + dcf9c00 commit fc7389f

35 files changed

+426
-382
lines changed

‎include/swift/AST/DiagnosticsSema.def

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7833,25 +7833,31 @@ ERROR(lifetime_dependence_invalid_param_name, none,
78337833
"invalid parameter name specified %0", (Identifier))
78347834
ERROR(lifetime_dependence_invalid_param_index, none,
78357835
"invalid parameter index specified %0", (unsigned))
7836-
ERROR(lifetime_dependence_invalid_self, none,
7837-
"invalid lifetime dependence specifier, self is valid in non-static "
7838-
"methods only", ())
7836+
ERROR(lifetime_dependence_invalid_self_in_static, none,
7837+
"invalid lifetime dependence specifier on non-existent self", ())
7838+
ERROR(lifetime_dependence_invalid_self_in_init, none,
7839+
"invalid lifetime dependence on self in an initializer", ())
78397840
ERROR(lifetime_dependence_duplicate_param_id, none,
78407841
"duplicate lifetime dependence specifier", ())
78417842
ERROR(lifetime_dependence_cannot_use_kind, none,
78427843
"invalid use of %0 lifetime dependence for %1 ownership",
78437844
(StringRef, StringRef))
7845+
ERROR(lifetime_dependence_cannot_use_parsed_scoped_consuming, none,
7846+
"invalid use of scoped lifetime dependence with consuming ownership",
7847+
())
7848+
ERROR(lifetime_dependence_cannot_use_inferred_scoped_consuming, none,
7849+
"invalid use of lifetime dependence on an Escapable parameter with "
7850+
"consuming ownership",
7851+
())
7852+
ERROR(lifetime_dependence_invalid_self_ownership, none,
7853+
"invalid scoped lifetime dependence on an Escapable self with consuming "
7854+
"ownership",
7855+
())
78447856
ERROR(lifetime_dependence_only_on_function_method_init_result, none,
78457857
"lifetime dependence specifiers may only be used on result of "
78467858
"functions, methods, initializers", ())
78477859
ERROR(lifetime_dependence_invalid_return_type, none,
78487860
"lifetime dependence can only be specified on ~Escapable results", ())
7849-
ERROR(lifetime_dependence_missing_ownership_modifier, none,
7850-
"lifetime dependence can only be specified on parameters with ownership "
7851-
"modifiers (borrowing, consuming, inout)", ())
7852-
ERROR(lifetime_dependence_cannot_infer_wo_ownership_modifier_on_method, none,
7853-
"cannot infer lifetime dependence, specify ownership modifier for the "
7854-
"method", ())
78557861
ERROR(lifetime_dependence_cannot_infer_ambiguous_candidate, none,
78567862
"cannot infer lifetime dependence, multiple ~Escapable or ~Copyable "
78577863
"parameters with ownership modifiers, specify explicit lifetime "
@@ -7862,9 +7868,6 @@ ERROR(lifetime_dependence_cannot_infer_no_candidates, none,
78627868
ERROR(lifetime_dependence_ctor_non_self_or_nil_return, none,
78637869
"expected nil or self as return values in an initializer with "
78647870
"lifetime dependent specifiers", ())
7865-
ERROR(lifetime_dependence_cannot_use_infer, none,
7866-
"invalid use of %0 lifetime dependence on Escapable type",
7867-
(StringRef))
78687871
ERROR(lifetime_dependence_on_bitwise_copyable, none,
78697872
"invalid lifetime dependence on bitwise copyable type", ())
78707873
ERROR(lifetime_dependence_cannot_infer_implicit_init, none,

‎include/swift/AST/LifetimeDependence.h

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,22 @@ class AbstractFunctionDecl;
3232
class LifetimeDependentReturnTypeRepr;
3333
class SILParameterInfo;
3434

35-
enum class LifetimeDependenceKind : uint8_t {
36-
Copy = 0,
37-
Consume,
38-
Borrow,
39-
Mutate
35+
enum class ParsedLifetimeDependenceKind : uint8_t {
36+
Default = 0,
37+
Scope,
38+
Inherit // Only used with deserialized decls
4039
};
4140

41+
enum class LifetimeDependenceKind : uint8_t { Inherit = 0, Scope };
42+
4243
class LifetimeDependenceSpecifier {
4344
public:
4445
enum class SpecifierKind { Named, Ordered, Self };
4546

4647
private:
4748
SourceLoc loc;
4849
SpecifierKind specifierKind;
49-
LifetimeDependenceKind lifetimeDependenceKind;
50+
ParsedLifetimeDependenceKind parsedLifetimeDependenceKind;
5051
union Value {
5152
struct {
5253
Identifier name;
@@ -61,35 +62,36 @@ class LifetimeDependenceSpecifier {
6162
Value() {}
6263
} value;
6364

64-
LifetimeDependenceSpecifier(SourceLoc loc, SpecifierKind specifierKind,
65-
LifetimeDependenceKind lifetimeDependenceKind,
66-
Value value)
65+
LifetimeDependenceSpecifier(
66+
SourceLoc loc, SpecifierKind specifierKind,
67+
ParsedLifetimeDependenceKind parsedLifetimeDependenceKind, Value value)
6768
: loc(loc), specifierKind(specifierKind),
68-
lifetimeDependenceKind(lifetimeDependenceKind), value(value) {}
69+
parsedLifetimeDependenceKind(parsedLifetimeDependenceKind),
70+
value(value) {}
6971

7072
public:
7173
static LifetimeDependenceSpecifier getNamedLifetimeDependenceSpecifier(
72-
SourceLoc loc, LifetimeDependenceKind kind, Identifier name) {
74+
SourceLoc loc, ParsedLifetimeDependenceKind kind, Identifier name) {
7375
return {loc, SpecifierKind::Named, kind, name};
7476
}
7577

7678
static LifetimeDependenceSpecifier getOrderedLifetimeDependenceSpecifier(
77-
SourceLoc loc, LifetimeDependenceKind kind, unsigned index) {
79+
SourceLoc loc, ParsedLifetimeDependenceKind kind, unsigned index) {
7880
return {loc, SpecifierKind::Ordered, kind, index};
7981
}
8082

8183
static LifetimeDependenceSpecifier
8284
getSelfLifetimeDependenceSpecifier(SourceLoc loc,
83-
LifetimeDependenceKind kind) {
85+
ParsedLifetimeDependenceKind kind) {
8486
return {loc, SpecifierKind::Self, kind, {}};
8587
}
8688

8789
SourceLoc getLoc() const { return loc; }
8890

8991
SpecifierKind getSpecifierKind() const { return specifierKind; }
9092

91-
LifetimeDependenceKind getLifetimeDependenceKind() const {
92-
return lifetimeDependenceKind;
93+
ParsedLifetimeDependenceKind getParsedLifetimeDependenceKind() const {
94+
return parsedLifetimeDependenceKind;
9395
}
9496

9597
Identifier getName() const {
@@ -114,19 +116,17 @@ class LifetimeDependenceSpecifier {
114116
llvm_unreachable("Invalid LifetimeDependenceSpecifier::SpecifierKind");
115117
}
116118

117-
StringRef getLifetimeDependenceKindString() const {
118-
switch (lifetimeDependenceKind) {
119-
case LifetimeDependenceKind::Borrow:
120-
return "_borrow";
121-
case LifetimeDependenceKind::Consume:
122-
return "_consume";
123-
case LifetimeDependenceKind::Copy:
124-
return "_copy";
125-
case LifetimeDependenceKind::Mutate:
126-
return "_mutate";
119+
std::string getLifetimeDependenceSpecifierString() const {
120+
switch (parsedLifetimeDependenceKind) {
121+
case ParsedLifetimeDependenceKind::Default:
122+
return "dependsOn(" + getParamString() + ")";
123+
case ParsedLifetimeDependenceKind::Scope:
124+
return "dependsOn(scoped " + getParamString() + ")";
125+
case ParsedLifetimeDependenceKind::Inherit:
126+
return "dependsOn(inherited " + getParamString() + ")";
127127
}
128128
llvm_unreachable(
129-
"Invalid LifetimeDependenceSpecifier::LifetimeDependenceKind");
129+
"Invalid LifetimeDependenceSpecifier::ParsedLifetimeDependenceKind");
130130
}
131131
};
132132

@@ -137,7 +137,7 @@ class LifetimeDependenceInfo {
137137

138138
static LifetimeDependenceInfo getForParamIndex(AbstractFunctionDecl *afd,
139139
unsigned index,
140-
ValueOwnership ownership);
140+
LifetimeDependenceKind kind);
141141

142142
public:
143143
LifetimeDependenceInfo()

‎include/swift/Parse/Parser.h

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,7 +1213,7 @@ class Parser {
12131213
return true;
12141214
if (Context.LangOpts.hasFeature(Feature::NonescapableTypes) &&
12151215
(Tok.isContextualKeyword("_resultDependsOn") ||
1216-
Tok.isLifetimeDependenceToken(isInSILMode())))
1216+
isLifetimeDependenceToken()))
12171217
return true;
12181218
return false;
12191219
}
@@ -1225,23 +1225,26 @@ class Parser {
12251225
consumeToken();
12261226
}
12271227

1228+
bool isLifetimeDependenceToken() {
1229+
if (!isInSILMode()) {
1230+
return Tok.isContextualKeyword("dependsOn");
1231+
}
1232+
return Tok.isContextualKeyword("_inherit") ||
1233+
Tok.isContextualKeyword("_scope");
1234+
}
1235+
12281236
bool canHaveParameterSpecifierContextualKeyword() {
12291237
// The parameter specifiers like `isolated`, `consuming`, `borrowing` are
12301238
// also valid identifiers and could be the name of a type. Check whether
12311239
// the following token is something that can introduce a type. Thankfully
12321240
// none of these tokens overlap with the set of tokens that can follow an
12331241
// identifier in a type production.
1234-
return Tok.is(tok::identifier)
1235-
&& peekToken().isAny(tok::at_sign,
1236-
tok::kw_inout,
1237-
tok::l_paren,
1238-
tok::identifier,
1239-
tok::l_square,
1240-
tok::kw_Any,
1241-
tok::kw_Self,
1242-
tok::kw__,
1243-
tok::kw_var,
1244-
tok::kw_let);
1242+
return (Tok.is(tok::identifier) &&
1243+
peekToken().isAny(tok::at_sign, tok::kw_inout, tok::l_paren,
1244+
tok::identifier, tok::l_square, tok::kw_Any,
1245+
tok::kw_Self, tok::kw__, tok::kw_var,
1246+
tok::kw_let)) ||
1247+
isLifetimeDependenceToken();
12451248
}
12461249

12471250
struct ParsedTypeAttributeList {

‎include/swift/Parse/Token.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -267,16 +267,6 @@ class Token {
267267
return MultilineString;
268268
}
269269

270-
bool isLifetimeDependenceToken(bool isInSILMode) const {
271-
return isContextualKeyword("_copy") || isContextualKeyword("_consume") ||
272-
isContextualKeyword("_borrow") || isContextualKeyword("_mutate") ||
273-
// SIL tests are currently written with _inherit/_scope
274-
// Once we have dependsOn()/dependsOn(borrowed:) other tokens go
275-
// away.
276-
(isInSILMode &&
277-
(isContextualKeyword("_inherit") || isContextualKeyword("_scope")));
278-
}
279-
280270
/// Count of extending escaping '#'.
281271
unsigned getCustomDelimiterLen() const {
282272
return CustomDelimiterLen;

‎lib/AST/ASTDumper.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3535,8 +3535,7 @@ class PrintTypeRepr : public TypeReprVisitor<PrintTypeRepr, void, StringRef>,
35353535
for (auto &dep : T->getLifetimeDependencies()) {
35363536
printFieldRaw(
35373537
[&](raw_ostream &out) {
3538-
out << dep.getLifetimeDependenceKindString() << "(";
3539-
out << dep.getParamString() << ")";
3538+
out << " " << dep.getLifetimeDependenceSpecifierString() << " ";
35403539
},
35413540
"");
35423541
}

‎lib/AST/ASTMangler.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3263,20 +3263,14 @@ void ASTMangler::appendParameterTypeListElement(
32633263

32643264
void ASTMangler::appendLifetimeDependenceKind(LifetimeDependenceKind kind,
32653265
bool isSelfDependence) {
3266-
// If we converge on dependsOn(borrowed: paramName)/dependsOn(paramName)
3267-
// syntax, this can be a single case value check.
3268-
if (kind == LifetimeDependenceKind::Borrow ||
3269-
kind == LifetimeDependenceKind::Mutate) {
3266+
if (kind == LifetimeDependenceKind::Scope) {
32703267
if (isSelfDependence) {
32713268
appendOperator("YLs");
32723269
} else {
32733270
appendOperator("Yls");
32743271
}
32753272
} else {
3276-
// If we converge on dependsOn(borrowed: paramName)/dependsOn(paramName)
3277-
// syntax, this can be a single case value check.
3278-
assert(kind == LifetimeDependenceKind::Copy ||
3279-
kind == LifetimeDependenceKind::Consume);
3273+
assert(kind == LifetimeDependenceKind::Inherit);
32803274
if (isSelfDependence) {
32813275
appendOperator("YLi");
32823276
} else {

‎lib/AST/ASTPrinter.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4137,8 +4137,7 @@ void PrintAST::visitFuncDecl(FuncDecl *decl) {
41374137
if (auto *typeRepr = dyn_cast_or_null<LifetimeDependentReturnTypeRepr>(
41384138
decl->getResultTypeRepr())) {
41394139
for (auto &dep : typeRepr->getLifetimeDependencies()) {
4140-
Printer << " " << dep.getLifetimeDependenceKindString() << "(";
4141-
Printer << dep.getParamString() << ") ";
4140+
Printer << " " << dep.getLifetimeDependenceSpecifierString() << " ";
41424141
}
41434142
}
41444143
}
@@ -4378,8 +4377,7 @@ void PrintAST::visitConstructorDecl(ConstructorDecl *decl) {
43784377
auto *typeRepr =
43794378
cast<LifetimeDependentReturnTypeRepr>(decl->getResultTypeRepr());
43804379
for (auto &dep : typeRepr->getLifetimeDependencies()) {
4381-
Printer << dep.getLifetimeDependenceKindString() << "(";
4382-
Printer << dep.getParamString() << ") ";
4380+
Printer << dep.getLifetimeDependenceSpecifierString() << " ";
43834381
}
43844382
// TODO: Handle failable initializers with lifetime dependent returns
43854383
Printer << "Self";

‎lib/AST/TypeRepr.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -692,9 +692,9 @@ SourceLoc LifetimeDependentReturnTypeRepr::getLocImpl() const {
692692

693693
void LifetimeDependentReturnTypeRepr::printImpl(
694694
ASTPrinter &Printer, const PrintOptions &Opts) const {
695+
Printer << " ";
695696
for (auto &dep : getLifetimeDependencies()) {
696-
Printer << dep.getLifetimeDependenceKindString() << "(";
697-
Printer << dep.getParamString() << ")";
697+
Printer << dep.getLifetimeDependenceSpecifierString() << " ";
698698
}
699699

700700
printTypeRepr(getBase(), Printer, Opts);

‎lib/Parse/ParseDecl.cpp

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5060,34 +5060,33 @@ ParserStatus Parser::parseTypeAttribute(TypeOrCustomAttr &result,
50605060
llvm_unreachable("bad attribute kind");
50615061
}
50625062

5063-
static std::optional<LifetimeDependenceKind>
5064-
getLifetimeDependenceKind(const Token &T) {
5065-
if (T.isContextualKeyword("_copy") || T.isContextualKeyword("_inherit")) {
5066-
return LifetimeDependenceKind::Copy;
5063+
static ParsedLifetimeDependenceKind getSILLifetimeDependenceKind(const Token &T) {
5064+
if (T.isContextualKeyword("_inherit")) {
5065+
return ParsedLifetimeDependenceKind::Inherit;
50675066
}
5068-
if (T.isContextualKeyword("_consume")) {
5069-
return LifetimeDependenceKind::Consume;
5070-
}
5071-
if (T.isContextualKeyword("_borrow") || T.isContextualKeyword("_scope")) {
5072-
return LifetimeDependenceKind::Borrow;
5073-
}
5074-
if (T.isContextualKeyword("_mutate")) {
5075-
return LifetimeDependenceKind::Mutate;
5076-
}
5077-
return std::nullopt;
5067+
assert(T.isContextualKeyword("_scope"));
5068+
return ParsedLifetimeDependenceKind::Scope;
50785069
}
50795070

50805071
ParserStatus Parser::parseLifetimeDependenceSpecifiers(
50815072
SmallVectorImpl<LifetimeDependenceSpecifier> &specifierList) {
50825073
ParserStatus status;
50835074
// TODO: Add fixits for diagnostics in this function.
50845075
do {
5085-
auto lifetimeDependenceKind = getLifetimeDependenceKind(Tok);
5086-
if (!lifetimeDependenceKind.has_value()) {
5076+
if (!isLifetimeDependenceToken()) {
50875077
break;
50885078
}
5089-
// consume the lifetime dependence kind
5090-
consumeToken();
5079+
5080+
auto lifetimeDependenceKind = ParsedLifetimeDependenceKind::Default;
5081+
5082+
if (!isInSILMode()) {
5083+
// consume dependsOn
5084+
consumeToken();
5085+
} else {
5086+
lifetimeDependenceKind = getSILLifetimeDependenceKind(Tok);
5087+
// consume _inherit or _scope
5088+
consumeToken();
5089+
}
50915090

50925091
if (!Tok.isFollowingLParen()) {
50935092
diagnose(Tok, diag::expected_lparen_after_lifetime_dependence);
@@ -5096,6 +5095,16 @@ ParserStatus Parser::parseLifetimeDependenceSpecifiers(
50965095
}
50975096
// consume the l_paren
50985097
auto lParenLoc = consumeToken();
5098+
5099+
if (!isInSILMode()) {
5100+
// look for optional "scoped"
5101+
if (Tok.isContextualKeyword("scoped")) {
5102+
lifetimeDependenceKind = ParsedLifetimeDependenceKind::Scope;
5103+
// consume scoped
5104+
consumeToken();
5105+
}
5106+
}
5107+
50995108
SourceLoc rParenLoc;
51005109
bool foundParamId = false;
51015110
status = parseList(
@@ -5111,7 +5120,7 @@ ParserStatus Parser::parseLifetimeDependenceSpecifiers(
51115120
specifierList.push_back(
51125121
LifetimeDependenceSpecifier::
51135122
getNamedLifetimeDependenceSpecifier(
5114-
paramLoc, *lifetimeDependenceKind, paramName));
5123+
paramLoc, lifetimeDependenceKind, paramName));
51155124
break;
51165125
}
51175126
case tok::integer_literal: {
@@ -5126,14 +5135,14 @@ ParserStatus Parser::parseLifetimeDependenceSpecifiers(
51265135
specifierList.push_back(
51275136
LifetimeDependenceSpecifier::
51285137
getOrderedLifetimeDependenceSpecifier(
5129-
paramLoc, *lifetimeDependenceKind, paramNum));
5138+
paramLoc, lifetimeDependenceKind, paramNum));
51305139
break;
51315140
}
51325141
case tok::kw_self: {
51335142
auto paramLoc = consumeToken(tok::kw_self);
51345143
specifierList.push_back(
51355144
LifetimeDependenceSpecifier::getSelfLifetimeDependenceSpecifier(
5136-
paramLoc, *lifetimeDependenceKind));
5145+
paramLoc, lifetimeDependenceKind));
51375146
break;
51385147
}
51395148
default:
@@ -5468,7 +5477,7 @@ ParserStatus Parser::ParsedTypeAttributeList::slowParse(Parser &P) {
54685477
continue;
54695478
}
54705479

5471-
if (Tok.isLifetimeDependenceToken(P.isInSILMode())) {
5480+
if (P.isLifetimeDependenceToken()) {
54725481
if (!P.Context.LangOpts.hasFeature(Feature::NonescapableTypes)) {
54735482
P.diagnose(Tok, diag::requires_experimental_feature,
54745483
"lifetime dependence specifier", false,

0 commit comments

Comments
 (0)