Skip to content

Commit 5519749

Browse files
rjmccallrjmccall
committed
[NFC] Collect protocol decls, not type, in ExistentialLayout
Another thing that will be necessary for correctness with compositions of parameterized protocols.
1 parent 524ef5d commit 5519749

27 files changed

+98
-118
lines changed

‎include/swift/AST/ExistentialLayout.h

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include "swift/Basic/ArrayRefView.h"
2121
#include "swift/AST/ASTContext.h"
22-
#include "swift/AST/Type.h"
22+
#include "swift/AST/Types.h"
2323

2424
namespace swift {
2525
class ProtocolDecl;
@@ -33,12 +33,11 @@ struct ExistentialLayout {
3333
hasExplicitAnyObject = false;
3434
containsNonObjCProtocol = false;
3535
containsParameterized = false;
36-
singleProtocol = nullptr;
3736
}
3837

39-
ExistentialLayout(ProtocolType *type);
40-
ExistentialLayout(ProtocolCompositionType *type);
41-
ExistentialLayout(ParameterizedProtocolType *type);
38+
ExistentialLayout(CanProtocolType type);
39+
ExistentialLayout(CanProtocolCompositionType type);
40+
ExistentialLayout(CanParameterizedProtocolType type);
4241

4342
/// The explicit superclass constraint, if any.
4443
Type explicitSuperclass;
@@ -91,28 +90,17 @@ struct ExistentialLayout {
9190
/// constraints?
9291
bool isErrorExistential() const;
9392

94-
static inline ProtocolType *getProtocolType(const Type &Ty) {
95-
return cast<ProtocolType>(Ty.getPointer());
96-
}
97-
typedef ArrayRefView<Type,ProtocolType*,getProtocolType> ProtocolTypeArrayRef;
98-
99-
ProtocolTypeArrayRef getProtocols() const & {
100-
if (singleProtocol)
101-
return llvm::makeArrayRef(&singleProtocol, 1);
93+
ArrayRef<ProtocolDecl*> getProtocols() const & {
10294
return protocols;
10395
}
104-
/// The returned ArrayRef may point directly to \c this->singleProtocol, so
96+
/// The returned ArrayRef points to internal storage, so
10597
/// calling this on a temporary is likely to be incorrect.
106-
ProtocolTypeArrayRef getProtocols() const && = delete;
98+
ArrayRef<ProtocolDecl*> getProtocols() const && = delete;
10799

108100
LayoutConstraint getLayoutConstraint() const;
109101

110102
private:
111-
// The protocol from a ProtocolType
112-
Type singleProtocol;
113-
114-
/// Zero or more protocol constraints from a ProtocolCompositionType
115-
ArrayRef<Type> protocols;
103+
SmallVector<ProtocolDecl *, 4> protocols;
116104

117105
/// Zero or more primary associated type requirements from a
118106
/// ParameterizedProtocolType

‎include/swift/AST/Types.h

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2772,6 +2772,7 @@ BEGIN_CAN_TYPE_WRAPPER(ExistentialMetatypeType, AnyMetatypeType)
27722772
MetatypeRepresentation repr) {
27732773
return CanExistentialMetatypeType(ExistentialMetatypeType::get(type, repr));
27742774
}
2775+
PROXY_CAN_TYPE_SIMPLE_GETTER(getExistentialInstanceType)
27752776
END_CAN_TYPE_WRAPPER(ExistentialMetatypeType, AnyMetatypeType)
27762777

27772778
/// ModuleType - This is the type given to a module value, e.g. the "Builtin" in
@@ -5258,6 +5259,9 @@ class ProtocolCompositionType final : public TypeBase,
52585259
}
52595260
};
52605261
BEGIN_CAN_TYPE_WRAPPER(ProtocolCompositionType, Type)
5262+
CanTypeArrayRef getMembers() const {
5263+
return CanTypeArrayRef(getPointer()->getMembers());
5264+
}
52615265
END_CAN_TYPE_WRAPPER(ProtocolCompositionType, Type)
52625266

52635267
/// ParameterizedProtocolType - A type that constrains one or more primary
@@ -5295,11 +5299,19 @@ class ParameterizedProtocolType final : public TypeBase,
52955299
return Base;
52965300
}
52975301

5302+
ProtocolDecl *getProtocol() const {
5303+
return Base->getDecl();
5304+
}
5305+
52985306
ArrayRef<Type> getArgs() const {
52995307
return {getTrailingObjects<Type>(),
53005308
Bits.ParameterizedProtocolType.ArgCount};
53015309
}
53025310

5311+
bool requiresClass() const {
5312+
return getBaseType()->requiresClass();
5313+
}
5314+
53035315
void getRequirements(Type baseType, SmallVectorImpl<Requirement> &reqs) const;
53045316

53055317
void Profile(llvm::FoldingSetNodeID &ID) {
@@ -5321,7 +5333,9 @@ class ParameterizedProtocolType final : public TypeBase,
53215333
RecursiveTypeProperties properties);
53225334
};
53235335
BEGIN_CAN_TYPE_WRAPPER(ParameterizedProtocolType, Type)
5324-
PROXY_CAN_TYPE_SIMPLE_GETTER(getBaseType)
5336+
CanProtocolType getBaseType() const {
5337+
return CanProtocolType(getPointer()->getBaseType());
5338+
}
53255339
CanTypeArrayRef getArgs() const {
53265340
return CanTypeArrayRef(getPointer()->getArgs());
53275341
}
@@ -5352,6 +5366,9 @@ class ExistentialType final : public TypeBase {
53525366
if (auto composition = ConstraintType->getAs<ProtocolCompositionType>())
53535367
return composition->requiresClass();
53545368

5369+
if (auto paramProtocol = ConstraintType->getAs<ParameterizedProtocolType>())
5370+
return paramProtocol->requiresClass();
5371+
53555372
return false;
53565373
}
53575374

‎lib/AST/ASTMangler.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,8 +1045,7 @@ void ASTMangler::appendExistentialLayout(
10451045
bool First = true;
10461046
bool DroppedRequiresClass = false;
10471047
bool SawRequiresClass = false;
1048-
for (Type protoTy : layout.getProtocols()) {
1049-
auto proto = protoTy->castTo<ProtocolType>()->getDecl();
1048+
for (auto proto : layout.getProtocols()) {
10501049
// If we aren't allowed to emit marker protocols, suppress them here.
10511050
if (!AllowMarkerProtocols && proto->isMarkerProtocol()) {
10521051
if (proto->requiresClass())
@@ -1058,7 +1057,7 @@ void ASTMangler::appendExistentialLayout(
10581057
if (proto->requiresClass())
10591058
SawRequiresClass = true;
10601059

1061-
appendProtocolName(protoTy->castTo<ProtocolType>()->getDecl());
1060+
appendProtocolName(proto);
10621061
appendListSeparator(First);
10631062
}
10641063
if (First)
@@ -1258,7 +1257,8 @@ void ASTMangler::appendType(Type type, GenericSignature sig,
12581257

12591258
case TypeKind::Protocol: {
12601259
return appendExistentialLayout(
1261-
ExistentialLayout(cast<ProtocolType>(tybase)), sig, forDecl);
1260+
ExistentialLayout(CanProtocolType(cast<ProtocolType>(tybase))),
1261+
sig, forDecl);
12621262
}
12631263

12641264
case TypeKind::ProtocolComposition: {

‎lib/AST/ASTPrinter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2744,8 +2744,8 @@ static bool usesFeatureRethrowsProtocol(
27442744
if (auto inheritedType = inheritedEntry.getType()) {
27452745
if (inheritedType->isExistentialType()) {
27462746
auto layout = inheritedType->getExistentialLayout();
2747-
for (ProtocolType *protoTy : layout.getProtocols()) {
2748-
if (usesFeatureRethrowsProtocol(protoTy->getDecl(), checked))
2747+
for (ProtocolDecl *proto : layout.getProtocols()) {
2748+
if (usesFeatureRethrowsProtocol(proto, checked))
27492749
return true;
27502750
}
27512751
}

‎lib/AST/ClangTypeConverter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -728,8 +728,8 @@ ClangTypeConverter::visitProtocolCompositionType(ProtocolCompositionType *type)
728728
clangTy->getAs<clang::ObjCObjectPointerType>()->getPointeeType());
729729
}
730730

731-
for (Type t : layout.getProtocols()) {
732-
auto clangTy = convert(t);
731+
for (ProtocolDecl *proto : layout.getProtocols()) {
732+
auto clangTy = convert(proto->getDeclaredInterfaceType());
733733
if (clangTy.isNull())
734734
return clang::QualType();
735735
for (auto p : clangTy->getAs<clang::ObjCObjectPointerType>()->quals())

‎lib/AST/GenericEnvironment.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,8 +366,8 @@ GenericEnvironment::getOrCreateArchetypeFromInterfaceType(Type depType) {
366366
if (depType->is<GenericTypeParamType>()) {
367367
auto layout = getOpenedExistentialType()->getExistentialLayout();
368368
SmallVector<ProtocolDecl *, 2> protos;
369-
for (auto protoType : layout.getProtocols())
370-
protos.push_back(protoType->getDecl());
369+
for (auto proto : layout.getProtocols())
370+
protos.push_back(proto);
371371

372372
result = OpenedArchetypeType::getNew(this, requirements.anchor, protos,
373373
superclass, requirements.layout);

‎lib/AST/GenericSignatureBuilder.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4471,7 +4471,7 @@ ConstraintResult GenericSignatureBuilder::addTypeRequirement(
44714471
// getLookupConformanceFns used in here don't use that parameter anyway.
44724472
auto dependentType = CanType();
44734473
auto conformance =
4474-
getLookupConformanceFn()(dependentType, subjectType, proto->getDecl());
4474+
getLookupConformanceFn()(dependentType, subjectType, proto);
44754475

44764476
// FIXME: diagnose if there's no conformance.
44774477
if (conformance) {
@@ -4551,8 +4551,7 @@ ConstraintResult GenericSignatureBuilder::addTypeRequirement(
45514551
anyErrors = true;
45524552
}
45534553

4554-
for (auto *proto : layout.getProtocols()) {
4555-
auto *protoDecl = proto->getDecl();
4554+
for (auto *protoDecl : layout.getProtocols()) {
45564555
if (isErrorResult(addConformanceRequirement(resolvedSubject, protoDecl,
45574556
source)))
45584557
anyErrors = true;

‎lib/AST/Module.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,8 +1020,7 @@ ModuleDecl::lookupExistentialConformance(Type type, ProtocolDecl *protocol) {
10201020
}
10211021

10221022
// Otherwise, the existential might conform abstractly.
1023-
for (auto proto : layout.getProtocols()) {
1024-
auto *protoDecl = proto->getDecl();
1023+
for (auto protoDecl : layout.getProtocols()) {
10251024

10261025
// If we found the protocol we're looking for, return an abstract
10271026
// conformance to it.

‎lib/AST/NameLookup.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1624,8 +1624,7 @@ void namelookup::extractDirectlyReferencedNominalTypes(
16241624
if (auto compositionTy = type->getAs<ProtocolCompositionType>()) {
16251625
auto layout = compositionTy->getExistentialLayout();
16261626

1627-
for (auto proto : layout.getProtocols()) {
1628-
auto *protoDecl = proto->getDecl();
1627+
for (auto protoDecl : layout.getProtocols()) {
16291628
decls.push_back(protoDecl);
16301629
}
16311630

@@ -2304,8 +2303,8 @@ static DirectlyReferencedTypeDecls directReferencesForType(Type type) {
23042303
}
23052304

23062305
// Protocols.
2307-
for (auto protocolTy : layout.getProtocols())
2308-
result.push_back(protocolTy->getDecl());
2306+
for (auto protoDecl : layout.getProtocols())
2307+
result.push_back(protoDecl);
23092308
return result;
23102309
}
23112310

‎lib/AST/Type.cpp

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -264,28 +264,25 @@ bool TypeBase::allowsOwnership(const GenericSignatureImpl *sig) {
264264
return getCanonicalType().allowsOwnership(sig);
265265
}
266266

267-
ExistentialLayout::ExistentialLayout(ProtocolType *type) {
268-
assert(type->isCanonical());
269-
267+
ExistentialLayout::ExistentialLayout(CanProtocolType type) {
270268
auto *protoDecl = type->getDecl();
271269

272270
hasExplicitAnyObject = false;
273271
containsNonObjCProtocol = !protoDecl->isObjC();
274272
containsParameterized = false;
275273

276-
singleProtocol = type;
274+
protocols.push_back(protoDecl);
277275
}
278276

279-
ExistentialLayout::ExistentialLayout(ProtocolCompositionType *type) {
280-
assert(type->isCanonical());
281-
277+
ExistentialLayout::ExistentialLayout(CanProtocolCompositionType type) {
282278
hasExplicitAnyObject = type->hasExplicitAnyObject();
283279
containsNonObjCProtocol = false;
284280
containsParameterized = false;
285281

286282
auto members = type.getMembers();
287283
if (!members.empty() &&
288-
isa<ClassDecl>(members[0].getAnyNominal())) {
284+
(members[0].getClassOrBoundGenericClass() ||
285+
isa<UnboundGenericType>(members[0]))) {
289286
explicitSuperclass = members[0];
290287
members = members.slice(1);
291288
}
@@ -300,16 +297,12 @@ ExistentialLayout::ExistentialLayout(ProtocolCompositionType *type) {
300297
containsParameterized = true;
301298
}
302299
containsNonObjCProtocol |= !protoDecl->isObjC();
300+
protocols.push_back(protoDecl);
303301
}
304-
305-
singleProtocol = nullptr;
306-
protocols = { members.data(), members.size() };
307302
}
308303

309-
ExistentialLayout::ExistentialLayout(ParameterizedProtocolType *type) {
310-
assert(type->isCanonical());
311-
312-
*this = ExistentialLayout(type->getBaseType());
304+
ExistentialLayout::ExistentialLayout(CanParameterizedProtocolType type)
305+
: ExistentialLayout(type.getBaseType()) {
313306
sameTypeRequirements = type->getArgs();
314307
containsParameterized = true;
315308
}
@@ -320,10 +313,10 @@ ExistentialLayout TypeBase::getExistentialLayout() {
320313

321314
ExistentialLayout CanType::getExistentialLayout() {
322315
if (auto existential = dyn_cast<ExistentialType>(*this))
323-
return existential->getConstraintType()->getExistentialLayout();
316+
return existential.getConstraintType().getExistentialLayout();
324317

325318
if (auto metatype = dyn_cast<ExistentialMetatypeType>(*this))
326-
return metatype->getInstanceType()->getExistentialLayout();
319+
return metatype.getInstanceType().getExistentialLayout();
327320

328321
if (auto proto = dyn_cast<ProtocolType>(*this))
329322
return ExistentialLayout(proto);
@@ -351,11 +344,10 @@ Type ExistentialLayout::getSuperclass() const {
351344
if (explicitSuperclass)
352345
return explicitSuperclass;
353346

354-
for (auto proto : getProtocols()) {
347+
for (auto protoDecl : getProtocols()) {
355348
// If we have a generic signature, check there, because it
356349
// will pick up superclass constraints from protocols that we
357350
// refine as well.
358-
auto *protoDecl = proto->getDecl();
359351
if (auto genericSig = protoDecl->getGenericSignature()) {
360352
if (auto superclass = genericSig->getSuperclassBound(
361353
protoDecl->getSelfInterfaceType()))
@@ -429,7 +421,7 @@ bool TypeBase::isActorType() {
429421
}
430422

431423
for (auto proto : layout.getProtocols()) {
432-
if (proto->isActorType())
424+
if (proto->isActor())
433425
return true;
434426
}
435427

@@ -464,9 +456,9 @@ bool TypeBase::isDistributedActor() {
464456

465457
auto layout = getExistentialLayout();
466458
return llvm::any_of(layout.getProtocols(),
467-
[&actorProto](ProtocolType *protocol) {
468-
return protocol->getDecl() == actorProto ||
469-
protocol->isDistributedActor();
459+
[&actorProto](ProtocolDecl *protocol) {
460+
return protocol == actorProto ||
461+
protocol->inheritsFrom(actorProto);
470462
});
471463
}
472464

@@ -1005,15 +997,14 @@ bool ExistentialLayout::isErrorExistential() const {
1005997
return (!hasExplicitAnyObject &&
1006998
!explicitSuperclass &&
1007999
protocols.size() == 1 &&
1008-
protocols[0]->getDecl()->isSpecificProtocol(KnownProtocolKind::Error));
1000+
protocols[0]->isSpecificProtocol(KnownProtocolKind::Error));
10091001
}
10101002

10111003
bool ExistentialLayout::isExistentialWithError(ASTContext &ctx) const {
10121004
auto errorProto = ctx.getProtocol(KnownProtocolKind::Error);
10131005
if (!errorProto) return false;
10141006

1015-
for (auto proto : getProtocols()) {
1016-
auto *protoDecl = proto->getDecl();
1007+
for (auto protoDecl : getProtocols()) {
10171008
if (protoDecl == errorProto || protoDecl->inheritsFrom(errorProto))
10181009
return true;
10191010
}
@@ -3985,7 +3976,7 @@ void ParameterizedProtocolType::Profile(llvm::FoldingSetNodeID &ID,
39853976

39863977
void ParameterizedProtocolType::getRequirements(
39873978
Type baseType, SmallVectorImpl<Requirement> &reqs) const {
3988-
auto *protoDecl = getBaseType()->getDecl();
3979+
auto *protoDecl = getProtocol();
39893980

39903981
auto assocTypes = protoDecl->getPrimaryAssociatedTypes();
39913982
auto argTypes = getArgs();

0 commit comments

Comments
 (0)