From e036c7f38e3b8b1f0b0e0ac1b4ef22fc6f16963b Mon Sep 17 00:00:00 2001 From: ArielG-NV <159081215+ArielG-NV@users.noreply.github.com> Date: Tue, 8 Jul 2025 17:18:02 -0700 Subject: Fix `extension` incorrectly interacting with `equality` and `type-coercion` constraints (#7578) * fix problem * cleanup comment * format code * make change more restrictive * format code * push logic update * format code * push test fix * make test more general --------- Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> --- source/slang/slang-check-constraint.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/slang/slang-check-constraint.cpp') diff --git a/source/slang/slang-check-constraint.cpp b/source/slang/slang-check-constraint.cpp index 7c55c440c..7c6f8929a 100644 --- a/source/slang/slang-check-constraint.cpp +++ b/source/slang/slang-check-constraint.cpp @@ -363,6 +363,7 @@ DeclRef SemanticsVisitor::trySolveConstraintSystem( ValUnificationContext unificationContext; unificationContext.optionalConstraint = constraintDeclRef.getDecl()->hasModifier(); + unificationContext.equalityConstraint = constraintDeclRef.getDecl()->isEqualityConstraint; if (!TryUnifyTypes( *system, unificationContext, @@ -492,6 +493,8 @@ DeclRef SemanticsVisitor::trySolveConstraintSystem( { if (c.isOptional) joinType = type; + else if (c.isEquality) + joinType = type; else // failure! return DeclRef(); @@ -970,6 +973,7 @@ bool SemanticsVisitor::TryUnifyTypeParam( constraint.val = type; constraint.isUsedAsLValue = type.isLeftValue; constraint.isOptional = unificationContext.optionalConstraint; + constraint.isEquality = unificationContext.equalityConstraint; constraints.constraints.add(constraint); return true; -- cgit v1.2.3