From 3d7552582bb4d4e330b1e90bcdced046cebd140c Mon Sep 17 00:00:00 2001 From: Sai Praveen Bangaru <31557731+saipraveenb25@users.noreply.github.com> Date: Tue, 15 Aug 2023 15:24:18 -0400 Subject: Fix bug with overload resolution under nested generics (#3107) * Add test for generic param inference bug for nested generics * Change description & simplify test * Add expected file * Check parent decl before unifying type parameters --- source/slang/slang-check-constraint.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'source') diff --git a/source/slang/slang-check-constraint.cpp b/source/slang/slang-check-constraint.cpp index d66bf35cc..e7eccfaec 100644 --- a/source/slang/slang-check-constraint.cpp +++ b/source/slang/slang-check-constraint.cpp @@ -705,14 +705,16 @@ namespace Slang auto fstDeclRef = fstDeclRefType->getDeclRef(); if (auto typeParamDecl = as(fstDeclRef.getDecl())) - return TryUnifyTypeParam(constraints, typeParamDecl, snd); + if (typeParamDecl->parentDecl == constraints.genericDecl) + return TryUnifyTypeParam(constraints, typeParamDecl, snd); if (auto sndDeclRefType = as(snd)) { auto sndDeclRef = sndDeclRefType->getDeclRef(); if (auto typeParamDecl = as(sndDeclRef.getDecl())) - return TryUnifyTypeParam(constraints, typeParamDecl, fst); + if (typeParamDecl->parentDecl == constraints.genericDecl) + return TryUnifyTypeParam(constraints, typeParamDecl, fst); // can't be unified if they refer to different declarations. if (fstDeclRef.getDecl() != sndDeclRef.getDecl()) return false; @@ -816,7 +818,7 @@ namespace Slang if (auto typeParamDecl = as(fstDeclRef.getDecl())) { - if(typeParamDecl->parentDecl == constraints.genericDecl ) + if(typeParamDecl->parentDecl == constraints.genericDecl) return TryUnifyTypeParam(constraints, typeParamDecl, snd); } } @@ -827,7 +829,7 @@ namespace Slang if (auto typeParamDecl = as(sndDeclRef.getDecl())) { - if(typeParamDecl->parentDecl == constraints.genericDecl ) + if(typeParamDecl->parentDecl == constraints.genericDecl) return TryUnifyTypeParam(constraints, typeParamDecl, fst); } } -- cgit v1.2.3