Skip to content

Commit 8137aed

Browse files
meg-guptameg-gupta
committed
Rename LifetimeDependentReturnTypeRepr -> LifetimeDependentTypeRepr
1 parent 4993f4b commit 8137aed

19 files changed

+85
-89
lines changed

‎include/swift/AST/LifetimeDependence.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
namespace swift {
3131

3232
class AbstractFunctionDecl;
33-
class LifetimeDependentReturnTypeRepr;
33+
class LifetimeDependentTypeRepr;
3434
class SILParameterInfo;
3535

3636
enum class ParsedLifetimeDependenceKind : uint8_t {
@@ -216,7 +216,7 @@ class LifetimeDependenceInfo {
216216

217217
/// Builds LifetimeDependenceInfo from SIL
218218
static std::optional<LifetimeDependenceInfo>
219-
fromTypeRepr(LifetimeDependentReturnTypeRepr *lifetimeDependentRepr,
219+
fromTypeRepr(LifetimeDependentTypeRepr *lifetimeDependentRepr,
220220
SmallVectorImpl<SILParameterInfo> &params, DeclContext *dc);
221221
};
222222

‎include/swift/AST/TypeRepr.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class alignas(1 << TypeReprAlignInBits) TypeRepr
112112
NumElements : 32
113113
);
114114

115-
SWIFT_INLINE_BITFIELD_FULL(LifetimeDependentReturnTypeRepr, TypeRepr, 32,
115+
SWIFT_INLINE_BITFIELD_FULL(LifetimeDependentTypeRepr, TypeRepr, 32,
116116
: NumPadBits,
117117
NumDependencies : 32
118118
);
@@ -1118,7 +1118,8 @@ class SpecifierTypeRepr : public TypeRepr {
11181118
return T->getKind() == TypeReprKind::Ownership ||
11191119
T->getKind() == TypeReprKind::Isolated ||
11201120
T->getKind() == TypeReprKind::CompileTimeConst ||
1121-
T->getKind() == TypeReprKind::LifetimeDependentReturn ||
1121+
T->getKind() == TypeReprKind::LifetimeDependent ||
1122+
T->getKind() == TypeReprKind::Transferring ||
11221123
T->getKind() == TypeReprKind::Sending;
11231124
}
11241125
static bool classof(const SpecifierTypeRepr *T) { return true; }
@@ -1531,41 +1532,40 @@ class SILBoxTypeRepr final : public TypeRepr,
15311532
friend TypeRepr;
15321533
};
15331534

1534-
class LifetimeDependentReturnTypeRepr final
1535+
class LifetimeDependentTypeRepr final
15351536
: public SpecifierTypeRepr,
1536-
private llvm::TrailingObjects<LifetimeDependentReturnTypeRepr,
1537+
private llvm::TrailingObjects<LifetimeDependentTypeRepr,
15371538
LifetimeDependenceSpecifier> {
15381539
friend TrailingObjects;
15391540

1540-
size_t
1541-
numTrailingObjects(OverloadToken<LifetimeDependentReturnTypeRepr>) const {
1542-
return Bits.LifetimeDependentReturnTypeRepr.NumDependencies;
1541+
size_t numTrailingObjects(OverloadToken<LifetimeDependentTypeRepr>) const {
1542+
return Bits.LifetimeDependentTypeRepr.NumDependencies;
15431543
}
15441544

15451545
public:
1546-
LifetimeDependentReturnTypeRepr(
1547-
TypeRepr *base, ArrayRef<LifetimeDependenceSpecifier> specifiers)
1548-
: SpecifierTypeRepr(TypeReprKind::LifetimeDependentReturn, base,
1546+
LifetimeDependentTypeRepr(TypeRepr *base,
1547+
ArrayRef<LifetimeDependenceSpecifier> specifiers)
1548+
: SpecifierTypeRepr(TypeReprKind::LifetimeDependent, base,
15491549
specifiers.front().getLoc()) {
15501550
assert(base);
1551-
Bits.LifetimeDependentReturnTypeRepr.NumDependencies = specifiers.size();
1551+
Bits.LifetimeDependentTypeRepr.NumDependencies = specifiers.size();
15521552
std::uninitialized_copy(specifiers.begin(), specifiers.end(),
15531553
getTrailingObjects<LifetimeDependenceSpecifier>());
15541554
}
15551555

1556-
static LifetimeDependentReturnTypeRepr *
1556+
static LifetimeDependentTypeRepr *
15571557
create(ASTContext &C, TypeRepr *base,
15581558
ArrayRef<LifetimeDependenceSpecifier> specifiers);
15591559

15601560
ArrayRef<LifetimeDependenceSpecifier> getLifetimeDependencies() const {
15611561
return {getTrailingObjects<LifetimeDependenceSpecifier>(),
1562-
Bits.LifetimeDependentReturnTypeRepr.NumDependencies};
1562+
Bits.LifetimeDependentTypeRepr.NumDependencies};
15631563
}
15641564

15651565
static bool classof(const TypeRepr *T) {
1566-
return T->getKind() == TypeReprKind::LifetimeDependentReturn;
1566+
return T->getKind() == TypeReprKind::LifetimeDependent;
15671567
}
1568-
static bool classof(const LifetimeDependentReturnTypeRepr *T) { return true; }
1568+
static bool classof(const LifetimeDependentTypeRepr *T) { return true; }
15691569

15701570
private:
15711571
SourceLoc getStartLocImpl() const;
@@ -1608,7 +1608,7 @@ inline bool TypeRepr::isSimple() const {
16081608
case TypeReprKind::Sending:
16091609
case TypeReprKind::Placeholder:
16101610
case TypeReprKind::CompileTimeConst:
1611-
case TypeReprKind::LifetimeDependentReturn:
1611+
case TypeReprKind::LifetimeDependent:
16121612
return true;
16131613
}
16141614
llvm_unreachable("bad TypeRepr kind");

‎include/swift/AST/TypeReprNodes.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ ABSTRACT_TYPEREPR(Specifier, TypeRepr)
7474
TYPEREPR(Fixed, TypeRepr)
7575
TYPEREPR(SILBox, TypeRepr)
7676
TYPEREPR(Self, TypeRepr)
77-
TYPEREPR(LifetimeDependentReturn, TypeRepr)
77+
TYPEREPR(LifetimeDependent, TypeRepr)
7878
LAST_TYPEREPR(Self)
7979

8080
#undef SPECIFIER_TYPEREPR

‎lib/AST/ASTDumper.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3541,8 +3541,8 @@ class PrintTypeRepr : public TypeReprVisitor<PrintTypeRepr, void, StringRef>,
35413541
printFoot();
35423542
}
35433543

3544-
void visitLifetimeDependentReturnTypeRepr(LifetimeDependentReturnTypeRepr *T,
3545-
StringRef label) {
3544+
void visitLifetimeDependentTypeRepr(LifetimeDependentTypeRepr *T,
3545+
StringRef label) {
35463546
printCommon("type_lifetime_dependent_return", label);
35473547
for (auto &dep : T->getLifetimeDependencies()) {
35483548
printFieldRaw(

‎lib/AST/ASTPrinter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4083,7 +4083,7 @@ void PrintAST::visitFuncDecl(FuncDecl *decl) {
40834083
Printer.printDeclResultTypePre(decl, ResultTyLoc);
40844084
Printer.callPrintStructurePre(PrintStructureKind::FunctionReturnType);
40854085
{
4086-
if (auto *typeRepr = dyn_cast_or_null<LifetimeDependentReturnTypeRepr>(
4086+
if (auto *typeRepr = dyn_cast_or_null<LifetimeDependentTypeRepr>(
40874087
decl->getResultTypeRepr())) {
40884088
for (auto &dep : typeRepr->getLifetimeDependencies()) {
40894089
Printer << " " << dep.getLifetimeDependenceSpecifierString() << " ";
@@ -4321,7 +4321,7 @@ void PrintAST::visitConstructorDecl(ConstructorDecl *decl) {
43214321
if (decl->hasLifetimeDependentReturn()) {
43224322
Printer << " -> ";
43234323
auto *typeRepr =
4324-
cast<LifetimeDependentReturnTypeRepr>(decl->getResultTypeRepr());
4324+
cast<LifetimeDependentTypeRepr>(decl->getResultTypeRepr());
43254325
for (auto &dep : typeRepr->getLifetimeDependencies()) {
43264326
Printer << dep.getLifetimeDependenceSpecifierString() << " ";
43274327
}

‎lib/AST/ASTWalker.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2385,8 +2385,7 @@ bool Traversal::visitSILBoxTypeRepr(SILBoxTypeRepr *T) {
23852385
return false;
23862386
}
23872387

2388-
bool Traversal::visitLifetimeDependentReturnTypeRepr(
2389-
LifetimeDependentReturnTypeRepr *T) {
2388+
bool Traversal::visitLifetimeDependentTypeRepr(LifetimeDependentTypeRepr *T) {
23902389
return doIt(T->getBase());
23912390
}
23922391

‎lib/AST/Decl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10794,7 +10794,7 @@ bool ConstructorDecl::isObjCZeroParameterWithLongSelector() const {
1079410794
}
1079510795

1079610796
bool ConstructorDecl::hasLifetimeDependentReturn() const {
10797-
return isa_and_nonnull<LifetimeDependentReturnTypeRepr>(getResultTypeRepr());
10797+
return isa_and_nonnull<LifetimeDependentTypeRepr>(getResultTypeRepr());
1079810798
}
1079910799

1080010800
DestructorDecl::DestructorDecl(SourceLoc DestructorLoc, DeclContext *Parent)

‎lib/AST/LifetimeDependence.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ LifetimeDependenceInfo::fromTypeRepr(AbstractFunctionDecl *afd) {
193193
? (afd->getParameters()->size() + 1)
194194
: afd->getParameters()->size();
195195
auto lifetimeDependentRepr =
196-
cast<LifetimeDependentReturnTypeRepr>(afd->getResultTypeRepr());
196+
cast<LifetimeDependentTypeRepr>(afd->getResultTypeRepr());
197197

198198
if (hasEscapableResultOrYield(afd)) {
199199
diags.diagnose(lifetimeDependentRepr->getLoc(),
@@ -337,7 +337,7 @@ LifetimeDependenceInfo::fromTypeRepr(AbstractFunctionDecl *afd) {
337337
// LifetimeDependenceInfo from the swift decl. Reason for duplicated code is the
338338
// apis on type and ownership is different in SIL compared to Sema.
339339
std::optional<LifetimeDependenceInfo> LifetimeDependenceInfo::fromTypeRepr(
340-
LifetimeDependentReturnTypeRepr *lifetimeDependentRepr,
340+
LifetimeDependentTypeRepr *lifetimeDependentRepr,
341341
SmallVectorImpl<SILParameterInfo> &params, DeclContext *dc) {
342342
auto &ctx = dc->getASTContext();
343343
auto &diags = ctx.Diags;
@@ -530,7 +530,7 @@ std::optional<LifetimeDependenceInfo>
530530
LifetimeDependenceInfo::get(AbstractFunctionDecl *afd) {
531531
assert(isa<FuncDecl>(afd) || isa<ConstructorDecl>(afd));
532532
auto *returnTypeRepr = afd->getResultTypeRepr();
533-
if (isa_and_nonnull<LifetimeDependentReturnTypeRepr>(returnTypeRepr)) {
533+
if (isa_and_nonnull<LifetimeDependentTypeRepr>(returnTypeRepr)) {
534534
return LifetimeDependenceInfo::fromTypeRepr(afd);
535535
}
536536
return LifetimeDependenceInfo::infer(afd);

‎lib/AST/NameLookup.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3179,7 +3179,7 @@ directReferencesForTypeRepr(Evaluator &evaluator,
31793179
case TypeReprKind::OpaqueReturn:
31803180
case TypeReprKind::NamedOpaqueReturn:
31813181
case TypeReprKind::Existential:
3182-
case TypeReprKind::LifetimeDependentReturn:
3182+
case TypeReprKind::LifetimeDependent:
31833183
case TypeReprKind::Sending:
31843184
return result;
31853185

‎lib/AST/TypeRepr.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -675,28 +675,28 @@ SourceLoc SILBoxTypeRepr::getLocImpl() const {
675675
return LBraceLoc;
676676
}
677677

678-
LifetimeDependentReturnTypeRepr *LifetimeDependentReturnTypeRepr::create(
678+
LifetimeDependentTypeRepr *LifetimeDependentTypeRepr::create(
679679
ASTContext &C, TypeRepr *base,
680680
ArrayRef<LifetimeDependenceSpecifier> specifiers) {
681681
auto size = totalSizeToAlloc<LifetimeDependenceSpecifier>(specifiers.size());
682682
auto mem = C.Allocate(size, alignof(LifetimeDependenceSpecifier));
683-
return new (mem) LifetimeDependentReturnTypeRepr(base, specifiers);
683+
return new (mem) LifetimeDependentTypeRepr(base, specifiers);
684684
}
685685

686-
SourceLoc LifetimeDependentReturnTypeRepr::getStartLocImpl() const {
686+
SourceLoc LifetimeDependentTypeRepr::getStartLocImpl() const {
687687
return getLifetimeDependencies().front().getLoc();
688688
}
689689

690-
SourceLoc LifetimeDependentReturnTypeRepr::getEndLocImpl() const {
690+
SourceLoc LifetimeDependentTypeRepr::getEndLocImpl() const {
691691
return getLifetimeDependencies().back().getLoc();
692692
}
693693

694-
SourceLoc LifetimeDependentReturnTypeRepr::getLocImpl() const {
694+
SourceLoc LifetimeDependentTypeRepr::getLocImpl() const {
695695
return getBase()->getLoc();
696696
}
697697

698-
void LifetimeDependentReturnTypeRepr::printImpl(
699-
ASTPrinter &Printer, const PrintOptions &Opts) const {
698+
void LifetimeDependentTypeRepr::printImpl(ASTPrinter &Printer,
699+
const PrintOptions &Opts) const {
700700
Printer << " ";
701701
for (auto &dep : getLifetimeDependencies()) {
702702
Printer << dep.getLifetimeDependenceSpecifierString() << " ";

0 commit comments

Comments
 (0)