diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/slang/slang-check-decl.cpp | 2 | ||||
| -rw-r--r-- | source/slang/slang-check-expr.cpp | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/source/slang/slang-check-decl.cpp b/source/slang/slang-check-decl.cpp index ba91bbefa..4293db5ee 100644 --- a/source/slang/slang-check-decl.cpp +++ b/source/slang/slang-check-decl.cpp @@ -6602,6 +6602,7 @@ bool SemanticsVisitor::checkInterfaceConformance( { if (!isAssociatedTypeDecl(requiredMemberDecl.getDecl())) continue; + ensureDecl(requiredMemberDecl, DeclCheckState::ReadyForReference); auto requiredMemberDeclRef = m_astBuilder->getLookupDeclRef( subTypeConformsToSuperInterfaceWitness, requiredMemberDecl.getDecl()); @@ -6623,6 +6624,7 @@ bool SemanticsVisitor::checkInterfaceConformance( continue; if (requiredMemberDecl.as<DerivativeRequirementDecl>()) continue; + ensureDecl(requiredMemberDecl, DeclCheckState::ReadyForReference); auto requiredMemberDeclRef = m_astBuilder->getLookupDeclRef( subTypeConformsToSuperInterfaceWitness, requiredMemberDecl.getDecl()); diff --git a/source/slang/slang-check-expr.cpp b/source/slang/slang-check-expr.cpp index 8c170698b..47eb6be45 100644 --- a/source/slang/slang-check-expr.cpp +++ b/source/slang/slang-check-expr.cpp @@ -2038,6 +2038,12 @@ IntVal* SemanticsVisitor::tryConstantFoldExpr( } else if (auto enumRef = declRef.as<EnumCaseDecl>()) { + auto enumTypeDecl = enumRef.getParent().getDecl(); + if (enumTypeDecl && !enumTypeDecl->checkState.isBeingChecked()) + { + ensureDecl(enumRef.getParent(), DeclCheckState::DefinitionChecked); + } + // The cases in an `enum` declaration can also be used as constant expressions, if (auto tagExpr = getTagExpr(m_astBuilder, enumRef)) { |