diff options
| author | Yong He <yonghe@outlook.com> | 2024-12-09 04:47:53 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-09 20:47:53 +0800 |
| commit | 051ae8acec0a641bcaf86e7eeff35eff29e8922d (patch) | |
| tree | 4e385415742ad98c8842454fda14a9abb8112cb2 /source/slang/slang-lower-to-ir.cpp | |
| parent | 71e90a7ba78d0566e3b7da54df48f9af598e4cbb (diff) | |
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 <ellieh@nvidia.com>
Diffstat (limited to 'source/slang/slang-lower-to-ir.cpp')
| -rw-r--r-- | source/slang/slang-lower-to-ir.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
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<StmtLoweringVisitor> if (auto maxItersAttr = stmt->findModifier<MaxItersAttribute>()) { - getBuilder()->addLoopMaxItersDecoration(inst, maxItersAttr->value); + auto iters = lowerVal(context, maxItersAttr->value); + getBuilder()->addLoopMaxItersDecoration(inst, getSimpleVal(context, iters)); } else if (auto inferredMaxItersAttr = stmt->findModifier<InferredMaxItersAttribute>()) { @@ -6028,12 +6029,15 @@ struct StmtLoweringVisitor : StmtVisitor<StmtLoweringVisitor> { if (auto maxIters = stmt->findModifier<MaxItersAttribute>()) { - if (inferredMaxIters->value < maxIters->value) + if (auto constIntVal = as<ConstantIntVal>(maxIters->value)) { - context->getSink()->diagnose( - maxIters, - Diagnostics::forLoopTerminatesInFewerIterationsThanMaxIters, - inferredMaxIters->value); + if (inferredMaxIters->value < constIntVal->getValue()) + { + context->getSink()->diagnose( + maxIters, + Diagnostics::forLoopTerminatesInFewerIterationsThanMaxIters, + inferredMaxIters->value); + } } } } |
