Skip to content

5.9: [TypeLowering] NFC: Fix lexicality check for packs. #64650

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 1 commit into from
Mar 28, 2023
Merged

5.9: [TypeLowering] NFC: Fix lexicality check for packs. #64650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion lib/SIL/IR/AbstractionPattern.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,17 @@ static CanType getCanPackElementType(CanType type, unsigned index) {
return cast<PackType>(type).getElementType(index);
}

static CanType getCanSILPackElementType(CanType type, unsigned index) {
return cast<SILPackType>(type).getElementType(index);
}

static CanType getAnyCanPackElementType(CanType type, unsigned index) {
if (isa<PackType>(type)) {
return getCanPackElementType(type, index);
}
return getCanSILPackElementType(type, index);
}

AbstractionPattern
AbstractionPattern::getPackElementType(unsigned index) const {
switch (getKind()) {
Expand Down Expand Up @@ -583,7 +594,7 @@ AbstractionPattern::getPackElementType(unsigned index) const {
return AbstractionPattern::getOpaque();
return AbstractionPattern(getGenericSubstitutions(),
getGenericSignature(),
getCanPackElementType(getType(), index));
getAnyCanPackElementType(getType(), index));
}
llvm_unreachable("bad kind");
}
Expand Down
20 changes: 15 additions & 5 deletions lib/SIL/IR/TypeLowering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2733,7 +2733,7 @@ bool TypeConverter::visitAggregateLeaves(
return {ty->getCanonicalType(), origTy, field, index};
};
auto isAggregate = [](Type ty) {
return ty->is<TupleType>() || ty->getEnumOrBoundGenericEnum() ||
return ty->is<SILPackType>() || ty->is<TupleType>() || ty->getEnumOrBoundGenericEnum() ||
ty->getStructOrBoundGenericStruct();
};
insertIntoWorklist(substType, origType, nullptr, llvm::None);
Expand All @@ -2744,7 +2744,17 @@ bool TypeConverter::visitAggregateLeaves(
Optional<unsigned> index;
std::tie(ty, origTy, field, index) = popFromWorklist();
if (isAggregate(ty) && !isLeafAggregate(ty, origTy, field, index)) {
if (auto tupleTy = ty->getAs<TupleType>()) {
if (auto packTy = ty->getAs<SILPackType>()) {
for (auto packIndex : indices(packTy->getElementTypes())) {
auto origElementTy = origTy.getPackElementType(packIndex);
auto substElementTy =
packTy->getElementType(packIndex)->getCanonicalType();
substElementTy =
computeLoweredRValueType(context, origElementTy, substElementTy);
insertIntoWorklist(substElementTy, origElementTy, nullptr,
packIndex);
}
} else if (auto tupleTy = ty->getAs<TupleType>()) {
for (unsigned tupleIndex = 0, num = tupleTy->getNumElements();
tupleIndex < num; ++tupleIndex) {
auto origElementTy = origTy.getTupleElementType(tupleIndex);
Expand Down Expand Up @@ -2822,9 +2832,9 @@ void TypeConverter::verifyLowering(const TypeLowering &lowering,
// The field's type is an aggregate. Treat it as a leaf if it
// has a lifetime annotation.

// If it's a field of a tuple or the top-level type, there's no value
// decl on which to look for an attribute. It's a leaf iff the type
// has a lifetime annotation.
// If it's a field of a tuple, pack or the top-level type, there's no
// value decl on which to look for an attribute. It's a leaf iff the
// type has a lifetime annotation.
if (index || !field)
return getLifetimeAnnotation(ty).isSome();

Expand Down