From a0bea07503c68160ad2e88986ba98cfc2161bdff Mon Sep 17 00:00:00 2001 From: Sai Praveen Bangaru <31557731+saipraveenb25@users.noreply.github.com> Date: Wed, 23 Oct 2024 20:28:49 -0400 Subject: Fix several bugs with `specializeWithArgTypes()` (#5365) * Fix several bugs with `specializeWithArgTypes()` * Make all types L-values for the purposes of reflection API resolution --- source/slang/slang-reflection-api.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'source/slang/slang-reflection-api.cpp') diff --git a/source/slang/slang-reflection-api.cpp b/source/slang/slang-reflection-api.cpp index 45bbd400c..ae351aee9 100644 --- a/source/slang/slang-reflection-api.cpp +++ b/source/slang/slang-reflection-api.cpp @@ -808,9 +808,9 @@ SlangReflectionFunction* tryConvertExprToFunctionReflection(ASTBuilder* astBuild auto declRef = declRefExpr->declRef; if (auto genericDeclRef = declRef.as()) { - auto innerDeclRef = substituteDeclRef( - SubstitutionSet(genericDeclRef), astBuilder, genericDeclRef.getDecl()->inner); - declRef = createDefaultSubstitutionsIfNeeded(astBuilder, nullptr, innerDeclRef); + auto innerDeclRef = createDefaultSubstitutionsIfNeeded(astBuilder, nullptr, genericDeclRef.getDecl()->inner); + declRef = substituteDeclRef( + SubstitutionSet(genericDeclRef), astBuilder, innerDeclRef); } if (auto funcDeclRef = declRef.as()) @@ -3194,7 +3194,12 @@ SLANG_API SlangReflectionFunction* spReflectionFunction_specializeWithArgTypes( try { DiagnosticSink sink(linkage->getSourceManager(), Lexer::sourceLocationLexer); - return convert(linkage->specializeWithArgTypes(funcExpr, argTypeList, &sink).as()); + auto resultFunc = linkage->specializeWithArgTypes(funcExpr, argTypeList, &sink).as(); + + if (sink.getErrorCount() != 0) + return nullptr; // Failed coercion. + + return convert(resultFunc); } catch (...) { -- cgit v1.2.3