diff options
Diffstat (limited to 'source/slang/slang-legalize-types.cpp')
| -rw-r--r-- | source/slang/slang-legalize-types.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
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; |