From 051ae8acec0a641bcaf86e7eeff35eff29e8922d Mon Sep 17 00:00:00 2001 From: Yong He Date: Mon, 9 Dec 2024 04:47:53 -0800 Subject: Fix crash during emitCast of attributed type, allow MaxIters to take linktime const. (#5791) * Fix crash during emitCast of attributed type. * Allow [MaxIters] to take link time constants. --------- Co-authored-by: Ellie Hermaszewska --- source/slang/slang-lower-to-ir.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'source/slang/slang-lower-to-ir.cpp') diff --git a/source/slang/slang-lower-to-ir.cpp b/source/slang/slang-lower-to-ir.cpp index 75cf421af..ce6f8cb42 100644 --- a/source/slang/slang-lower-to-ir.cpp +++ b/source/slang/slang-lower-to-ir.cpp @@ -5938,7 +5938,8 @@ struct StmtLoweringVisitor : StmtVisitor if (auto maxItersAttr = stmt->findModifier()) { - getBuilder()->addLoopMaxItersDecoration(inst, maxItersAttr->value); + auto iters = lowerVal(context, maxItersAttr->value); + getBuilder()->addLoopMaxItersDecoration(inst, getSimpleVal(context, iters)); } else if (auto inferredMaxItersAttr = stmt->findModifier()) { @@ -6028,12 +6029,15 @@ struct StmtLoweringVisitor : StmtVisitor { if (auto maxIters = stmt->findModifier()) { - if (inferredMaxIters->value < maxIters->value) + if (auto constIntVal = as(maxIters->value)) { - context->getSink()->diagnose( - maxIters, - Diagnostics::forLoopTerminatesInFewerIterationsThanMaxIters, - inferredMaxIters->value); + if (inferredMaxIters->value < constIntVal->getValue()) + { + context->getSink()->diagnose( + maxIters, + Diagnostics::forLoopTerminatesInFewerIterationsThanMaxIters, + inferredMaxIters->value); + } } } } -- cgit v1.2.3