summaryrefslogtreecommitdiffstats
path: root/source/slang/slang-type-layout.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'source/slang/slang-type-layout.cpp')
-rw-r--r--source/slang/slang-type-layout.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/slang/slang-type-layout.cpp b/source/slang/slang-type-layout.cpp
index 45bacaa44..3da0cc95a 100644
--- a/source/slang/slang-type-layout.cpp
+++ b/source/slang/slang-type-layout.cpp
@@ -1467,6 +1467,8 @@ static LayoutSize GetElementCount(IntVal* val)
if (auto constantVal = as<ConstantIntVal>(val))
{
+ if (constantVal->value == kUnsizedArrayMagicLength)
+ return LayoutSize::infinite();
return LayoutSize(LayoutSize::RawValue(constantVal->value));
}
else if( auto varRefVal = as<GenericParamIntVal>(val) )
@@ -3669,7 +3671,7 @@ static TypeLayoutResult _createTypeLayout(
}
else if (auto arrayType = as<ArrayExpressionType>(type))
{
- return createArrayLikeTypeLayout(context, arrayType, arrayType->baseType, arrayType->arrayLength);
+ return createArrayLikeTypeLayout(context, arrayType, arrayType->getElementType(), arrayType->getElementCount());
}
else if (auto declRefType = as<DeclRefType>(type))
{