Skip to content

Commit bc95327

Browse files
committed
Fix build of LegalConstExprVerifier.cpp: Use hasGenericParamList() instead of isGeneric()
1 parent 7454562 commit bc95327

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
@@ -329,7 +329,9 @@ checkSupportedWithSectionAttribute(const Expr *expr,
329329
auto instanceType = baseType->getMetatypeInstanceType();
330330
if (auto nominal = instanceType->getNominalOrBoundGenericNominal()) {
331331
// Allow non-generic, non-resilient types
332-
if (!nominal->hasGenericParamList() && !nominal->isResilient()) {
332+
if (!nominal->hasGenericParamList() &&
333+
!nominal->getDeclContext()->isGenericContext() &&
334+
!nominal->isResilient()) {
333335
continue;
334336
}
335337
}
@@ -383,7 +385,9 @@ checkSupportedWithSectionAttribute(const Expr *expr,
383385
if (auto nominal =
384386
instanceType->getNominalOrBoundGenericNominal()) {
385387
// Allow non-generic, non-resilient types
386-
if (!nominal->isGeneric() && !nominal->isResilient()) {
388+
if (!nominal->hasGenericParamList() &&
389+
!nominal->getDeclContext()->isGenericContext() &&
390+
!nominal->isResilient()) {
387391
continue;
388392
}
389393
}

0 commit comments

Comments
 (0)