diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/slang/slang-ir-lower-generic-call.cpp | 5 | ||||
| -rw-r--r-- | source/slang/slang-lower-to-ir.cpp | 24 |
2 files changed, 23 insertions, 6 deletions
diff --git a/source/slang/slang-ir-lower-generic-call.cpp b/source/slang/slang-ir-lower-generic-call.cpp index 3571b7a27..7669593c6 100644 --- a/source/slang/slang-ir-lower-generic-call.cpp +++ b/source/slang/slang-ir-lower-generic-call.cpp @@ -218,9 +218,6 @@ namespace Slang auto newCall = builder->emitCallInst(calleeRetType, newCallee, args); auto callInstType = callInst->getDataType(); auto unpackInst = maybeUnpackValue(builder, callInstType, calleeRetType, newCall); - callInst->replaceUsesWith(unpackInst); - callInst->removeAndDeallocate(); - // Unpack other `out` arguments. for (auto& item : argsToUnpack) { @@ -229,6 +226,8 @@ namespace Slang auto unpackedVal = builder->emitUnpackAnyValue(originalValType, packedVal); builder->emitStore(item.dstArg, unpackedVal); } + callInst->replaceUsesWith(unpackInst); + callInst->removeAndDeallocate(); } IRInst* findInnerMostSpecializingBase(IRSpecialize* inst) diff --git a/source/slang/slang-lower-to-ir.cpp b/source/slang/slang-lower-to-ir.cpp index 8a40dbde9..c1738887d 100644 --- a/source/slang/slang-lower-to-ir.cpp +++ b/source/slang/slang-lower-to-ir.cpp @@ -6702,9 +6702,18 @@ struct DeclLoweringVisitor : DeclVisitor<DeclLoweringVisitor, LoweredValInfo> { HashSet<IRInst*> valuesToClone; markInstsToClone(valuesToClone, parentGeneric->getFirstBlock(), returnType); + // For Function Types, we always clone all generic parameters regardless of whether + // the generic parameter appears in the function signature or not. + if (returnType->getOp() == kIROp_FuncType) + { + for (auto genericParam : parentGeneric->getParams()) + { + markInstsToClone(valuesToClone, parentGeneric->getFirstBlock(), genericParam); + } + } if (valuesToClone.Count() == 0) { - // If returnType is independent of generic parameters, set + // If the new generic has no parameters, set // the generic inst's type to just `returnType`. parentGeneric->setFullType((IRType*)returnType); } @@ -6727,8 +6736,17 @@ struct DeclLoweringVisitor : DeclVisitor<DeclLoweringVisitor, LoweredValInfo> } IRInst* clonedReturnType = nullptr; cloneEnv.mapOldValToNew.TryGetValue(returnType, clonedReturnType); - SLANG_ASSERT(clonedReturnType); - typeBuilder.emitReturn(clonedReturnType); + if (clonedReturnType) + { + // If the type has explicit dependency on generic parameters, use + // the cloned type. + typeBuilder.emitReturn(clonedReturnType); + } + else + { + // Otherwise just use the original type value directly. + typeBuilder.emitReturn(returnType); + } parentGeneric->setFullType((IRType*)typeGeneric); returnType = typeGeneric; } |