Skip to content

Commit f8c92eb

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

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
@@ -280,7 +280,9 @@ checkSupportedWithSectionAttribute(const Expr *expr,
280280
auto instanceType = baseType->getMetatypeInstanceType();
281281
if (auto nominal = instanceType->getNominalOrBoundGenericNominal()) {
282282
// Allow non-generic, non-resilient types
283-
if (!nominal->hasGenericParamList() && !nominal->isResilient()) {
283+
if (!nominal->hasGenericParamList() &&
284+
!nominal->getDeclContext()->isGenericContext() &&
285+
!nominal->isResilient()) {
284286
continue;
285287
}
286288
}
@@ -334,7 +336,9 @@ checkSupportedWithSectionAttribute(const Expr *expr,
334336
if (auto nominal =
335337
instanceType->getNominalOrBoundGenericNominal()) {
336338
// Allow non-generic, non-resilient types
337-
if (!nominal->isGeneric() && !nominal->isResilient()) {
339+
if (!nominal->hasGenericParamList() &&
340+
!nominal->getDeclContext()->isGenericContext() &&
341+
!nominal->isResilient()) {
338342
continue;
339343
}
340344
}

0 commit comments

Comments
 (0)