From 9d99976703872d7608415da5a90d070bd5dec5b7 Mon Sep 17 00:00:00 2001 From: Sai Praveen Bangaru <31557731+saipraveenb25@users.noreply.github.com> Date: Fri, 17 Jan 2025 17:53:02 -0500 Subject: Fix circularity issue when checking multiple generic interface constraints. (#6121) * Fix circularity issue with checking multiple generic interface constraints * Create multi-generic-interface-constraint.slang * Update multi-generic-interface-constraint.slang * Update slang-check-inheritance.cpp --------- Co-authored-by: Yong He --- source/slang/slang-check-inheritance.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'source') diff --git a/source/slang/slang-check-inheritance.cpp b/source/slang/slang-check-inheritance.cpp index 7af2d2e81..b44858874 100644 --- a/source/slang/slang-check-inheritance.cpp +++ b/source/slang/slang-check-inheritance.cpp @@ -466,10 +466,14 @@ InheritanceInfo SharedSemanticsContext::_calcInheritanceInfo( if (constraintDeclRef.getDecl()->checkState.isBeingChecked()) continue; - ensureDecl(&visitor, constraintDeclRef.getDecl(), DeclCheckState::CanSpecializeGeneric); + ensureDecl(&visitor, constraintDeclRef.getDecl(), DeclCheckState::ScopesWired); - auto subType = getSub(astBuilder, constraintDeclRef); - auto superType = getSup(astBuilder, constraintDeclRef); + // Check only the sub-type. + visitor.CheckConstraintSubType(constraintDeclRef.getDecl()->sub); + auto sub = constraintDeclRef.getDecl()->sub; + if (!sub.type) + sub = visitor.TranslateTypeNodeForced(sub); + auto subType = constraintDeclRef.substitute(astBuilder, sub.type); // We only consider constraints where the type represented // by `declRef` is the subtype, since those @@ -489,6 +493,11 @@ InheritanceInfo SharedSemanticsContext::_calcInheritanceInfo( if (subDeclRefType->getDeclRef() != declRef) continue; + // Further check the constraint, since we now need the sup-type. + ensureDecl(&visitor, constraintDeclRef.getDecl(), DeclCheckState::CanSpecializeGeneric); + + auto superType = getSup(astBuilder, constraintDeclRef); + // Because the constraint is a declared inheritance relationship, // adding the base to our list of direct bases is as straightforward // as in all the preceding cases. -- cgit v1.2.3