commit 51b4b86da6453ce31d24b6768ec3fc00a07bf59f
author Ethan Nicholas <ethannicholas@google.com> Tue Aug 31 16:12:40 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Tue Aug 31 21:04:18 2021 +0000
tree 708a91dd2e51cc8f9a806089443537d0a141570d
parent 966723594d9350ec2d99b115a1bb442cd9468759

Improve DSL error reporting with invalid array sizes

This eliminates an extra "expected int literal" error when the
array size is an invalid expression.

Change-Id: Iaf5d15316df3ec5200d51d73c14d7e428ce17be9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/443236
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>

src/sksl/dsl/DSLFunction.cpp

diff --git a/src/sksl/dsl/DSLFunction.cpp b/src/sksl/dsl/DSLFunction.cpp
index 12484f2..8eff3e0 100644
--- a/src/sksl/dsl/DSLFunction.cpp
+++ b/src/sksl/dsl/DSLFunction.cpp
@@ -39,7 +39,7 @@
         if (param->fDeclared) {
             DSLWriter::ReportError("parameter has already been used in another function");
         }
-        SkASSERT(!param->fInitialValue.valid());
+        SkASSERT(!param->fInitialValue.hasValue());
         SkASSERT(!param->fDeclaration);
         param->fDeclared = true;
         std::unique_ptr<SkSL::Variable> paramVar = DSLWriter::CreateParameterVar(*param);