Skip to content

Commit 3ba0038

Browse files
committed
Fix build of LegalConstExprVerifier.cpp: Use hasGenericParamList() instead of isGeneric()
1 parent eca2e1e commit 3ba0038

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

lib/Sema/LegalConstExprVerifier.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,9 @@ checkSupportedWithSectionAttribute(const Expr *expr,
266266
auto instanceType = baseType->getMetatypeInstanceType();
267267
if (auto nominal = instanceType->getNominalOrBoundGenericNominal()) {
268268
// Allow non-generic, non-resilient types
269-
if (!nominal->hasGenericParamList() && !nominal->isResilient()) {
269+
if (!nominal->hasGenericParamList() &&
270+
!nominal->getDeclContext()->isGenericContext() &&
271+
!nominal->isResilient()) {
270272
continue;
271273
}
272274
}
@@ -320,7 +322,9 @@ checkSupportedWithSectionAttribute(const Expr *expr,
320322
if (auto nominal =
321323
instanceType->getNominalOrBoundGenericNominal()) {
322324
// Allow non-generic, non-resilient types
323-
if (!nominal->isGeneric() && !nominal->isResilient()) {
325+
if (!nominal->hasGenericParamList() &&
326+
!nominal->getDeclContext()->isGenericContext() &&
327+
!nominal->isResilient()) {
324328
continue;
325329
}
326330
}

0 commit comments

Comments
 (0)