Fix tuple AST & IR layout size queries (#7502)

* Fix tuple AST & IR layout size queries

* Don't peephole sizeof if size is still indeterminate

3 files changed, 18 insertions, 1 deletions

diff --git a/source/slang/slang-ast-natural-layout.cpp b/source/slang/slang-ast-natural-layout.cpp
index f15dee1d1..7643e0433 100644
--- a/source/slang/slang-ast-natural-layout.cpp
+++ b/source/slang/slang-ast-natural-layout.cpp
@@ -153,6 +153,12 @@ NaturalSize ASTNaturalLayoutContext::_calcSizeImpl(Type* type)
         // Initialize empty
         NaturalSize size = NaturalSize::makeEmpty();
 
+        // We can't compute the size of an abstract type pack yet.
+        if (isAbstractTypePack(tupleType->getTypePack()))
+        {
+            return NaturalSize::makeInvalid();
+        }
+
         // Accumulate over all the member types
         for (auto cur = 0; cur < tupleType->getMemberCount(); cur++)
         {
diff --git a/source/slang/slang-ir-layout.cpp b/source/slang/slang-ir-layout.cpp
index 795f47f55..ac0c79601 100644
--- a/source/slang/slang-ir-layout.cpp
+++ b/source/slang/slang-ir-layout.cpp
@@ -275,15 +275,26 @@ static Result _calcSizeAndAlignment(
         {
             auto tupleType = cast<IRTupleType>(type);
             IRSizeAndAlignment resultLayout;
+            IRIntegerValue lastFieldAlignment = 0;
+            IRType* lastFieldType = NULL;
             for (UInt i = 0; i < tupleType->getOperandCount(); i++)
             {
                 auto elementType = tupleType->getOperand(i);
                 IRSizeAndAlignment fieldTypeLayout;
                 SLANG_RETURN_ON_FAIL(
                     getSizeAndAlignment(optionSet, rules, (IRType*)elementType, &fieldTypeLayout));
+                resultLayout.size = rules->adjustOffset(
+                    resultLayout.size,
+                    fieldTypeLayout.size,
+                    lastFieldType,
+                    lastFieldAlignment);
                 resultLayout.size = align(resultLayout.size, fieldTypeLayout.alignment);
                 resultLayout.alignment =
                     std::max(resultLayout.alignment, fieldTypeLayout.alignment);
+
+                resultLayout.size += fieldTypeLayout.size;
+                lastFieldType = as<IRType>(elementType);
+                lastFieldAlignment = fieldTypeLayout.alignment;
             }
             *outSizeAndAlignment = rules->alignCompositeElement(resultLayout);
             return SLANG_OK;
diff --git a/source/slang/slang-ir-peephole.cpp b/source/slang/slang-ir-peephole.cpp
index 7f3ff1d68..cafe978f9 100644
--- a/source/slang/slang-ir-peephole.cpp
+++ b/source/slang/slang-ir-peephole.cpp
@@ -281,7 +281,7 @@ struct PeepholeContext : InstPassBase
                         baseType,
                         &sizeAlignment)))
                     break;
-                if (sizeAlignment.size == 0)
+                if (sizeAlignment.size == IRSizeAndAlignment::kIndeterminateSize)
                     break;
 
                 IRBuilder builder(module);