From ecf85df6eee3da76ef54b14e4ab083f22da89e46 Mon Sep 17 00:00:00 2001 From: Yong He Date: Sun, 18 Aug 2024 21:57:24 -0700 Subject: Variadic Generics Part 2: IR lowering and specialization. (#4849) * Variadic Generics Part 2: IR lowering and specialization. * Update design doc status. * Update design doc. * Resolve review comments. --- source/slang/slang-legalize-types.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'source/slang/slang-legalize-types.cpp') diff --git a/source/slang/slang-legalize-types.cpp b/source/slang/slang-legalize-types.cpp index 5e8390cef..6009ef33e 100644 --- a/source/slang/slang-legalize-types.cpp +++ b/source/slang/slang-legalize-types.cpp @@ -287,6 +287,11 @@ struct TupleTypeBuilder { specialType = legalFieldType; } + + // `void` is currently legalized to simple, but we don't want to add a + // `void` field to the struct. + if (legalLeafType.getSimple()->getOp() == kIROp_VoidType) + return; } break; @@ -419,7 +424,6 @@ struct TupleTypeBuilder bool isSpecialField = context->isSpecialType(fieldType); auto legalFieldType = legalizeType(context, fieldType); - addField( field->getKey(), legalFieldType, @@ -1385,10 +1389,15 @@ LegalType legalizeTypeImpl( context, arrayType->getElementType()); - // If element type hasn't change, return original type. - if (legalElementType.flavor == LegalType::Flavor::simple && - legalElementType.getSimple() == arrayType->getElementType()) - return LegalType::simple(arrayType); + if (legalElementType.flavor == LegalType::Flavor::simple) + { + if (legalElementType.getSimple()->getOp() == kIROp_VoidType) + return LegalType(); + + // If element type hasn't change, return original type. + if (legalElementType.getSimple() == arrayType->getElementType()) + return LegalType::simple(arrayType); + } ArrayLegalTypeWrapper wrapper; wrapper.arrayType = arrayType; -- cgit v1.2.3