2 files changed, 56 insertions, 1 deletions
diff --git a/source/slang/slang-check-expr.cpp b/source/slang/slang-check-expr.cpp
index 842ffb527..ec4182059 100644
--- a/source/slang/slang-check-expr.cpp
+++ b/source/slang/slang-check-expr.cpp
@@ -2021,10 +2021,60 @@ namespace Slang
             // We can return as an IntVal
             return getASTBuilder()->getIntVal(expr.getExpr()->type, value);
         }
-        
+        else if (auto indexExpr = expr.as<IndexExpr>())
+        {
+            return tryFoldIndexExpr(indexExpr.getExpr(), kind, circularityInfo);
+        }
         return nullptr;
     }
 
+    IntVal* SemanticsVisitor::tryFoldIndexExpr(
+        SubstExpr<IndexExpr>            expr,
+        ConstantFoldingKind             kind,
+        ConstantFoldingCircularityInfo* circularityInfo)
+    {
+        // Ad-hoc constant folding for index expressions.
+        // TOOD: we should generalize this by extending `Val` to support compile-time constants that are
+        // not just integers, but also arrays and structs etc, so that we can independently fold
+        // the base expression and the index expression, and then form a ElementExtractVal() from an
+        // index expr.
+        // For now we just specialize case for array expression that is an initialization list.
+        // And this won't work if the array is a link-time constant.
+        //
+        auto declRefExpr = as<DeclRefExpr>(expr.getExpr()->baseExpression);
+        if (!declRefExpr)
+            return nullptr;
+        auto varDecl = as<VarDecl>(declRefExpr->declRef.getDecl());
+        if (!varDecl)
+            return nullptr;
+        auto type = varDecl->getType();
+        if (!type)
+            return nullptr;
+        auto arrayType = as<ArrayExpressionType>(type);
+        if (!arrayType)
+            return nullptr;
+        if (!varDecl->hasModifier<ConstModifier>())
+            return nullptr;
+        if (isGlobalDecl(varDecl) && !varDecl->hasModifier<HLSLStaticModifier>())
+            return nullptr;
+        if (!varDecl->initExpr)
+            return nullptr;
+        auto arrayContentExpr = as<InitializerListExpr>(varDecl->initExpr);
+        if (!arrayContentExpr)
+            return nullptr;
+        if (expr.getExpr()->indexExprs.getCount() != 1)
+            return nullptr;
+        auto indexVal = as<ConstantIntVal>(tryFoldIntegerConstantExpression(
+            expr.getExpr()->indexExprs[0], kind, circularityInfo));
+        if (!indexVal)
+            return nullptr;
+        auto index = indexVal->getValue();
+        if (index < 0 || index >= arrayContentExpr->args.getCount())
+            return nullptr;
+        auto elementExpr = arrayContentExpr->args[Index(index)];
+        return tryFoldIntegerConstantExpression(elementExpr, kind, circularityInfo);
+    }
+
     IntVal* SemanticsVisitor::tryFoldIntegerConstantExpression(
         SubstExpr<Expr>                 expr,
         ConstantFoldingKind             kind,
diff --git a/source/slang/slang-check-impl.h b/source/slang/slang-check-impl.h
index 2f3eae0c5..5d70c36d5 100644
--- a/source/slang/slang-check-impl.h
+++ b/source/slang/slang-check-impl.h
@@ -2089,6 +2089,11 @@ namespace Slang
             ConstantFoldingKind             kind,
             ConstantFoldingCircularityInfo* circularityInfo);
 
+        IntVal* tryFoldIndexExpr(
+            SubstExpr<IndexExpr> expr,
+            ConstantFoldingKind             kind,
+            ConstantFoldingCircularityInfo* circularityInfo);
+
         // Enforce that an expression resolves to an integer constant, and get its value
         enum class IntegerConstantExpressionCoercionType
         {