commit 78b84cc76a6693869f48d2b4182cac791ec78a86
author John Stiles <johnstiles@google.com> Wed Sep 15 09:44:54 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Wed Sep 15 14:29:45 2021 +0000
tree cb65f97f5cc42be382069aa108952b58893ce0b1
parent 857c7f9dc5dd3784fb0367bbfb0cc3ddcb86bcee

Fix size calculation of blockless for-loops.

Change-Id: Id6e1d1be276af01ce05777682dde8b58d803aedc
Bug: oss-fuzz:37837
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/449097
Commit-Queue: John Stiles <johnstiles@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

src/sksl/SkSLAnalysis.cpp

diff --git a/src/sksl/SkSLAnalysis.cpp b/src/sksl/SkSLAnalysis.cpp
index 451d7e9..d7ffe72 100644
--- a/src/sksl/SkSLAnalysis.cpp
+++ b/src/sksl/SkSLAnalysis.cpp
@@ -702,8 +702,8 @@
                         SkDEBUGFAIL("for-loops should always have unroll info in an ES2 program");
                     }
 
-                    result = INHERITED::visitExpression(*forStmt.next()) ||
-                             INHERITED::visitStatement(*forStmt.statement()) || result;
+                    result = this->visitExpression(*forStmt.next()) ||
+                             this->visitStatement(*forStmt.statement()) || result;
 
                     fUnrollFactor = originalUnrollFactor;
                     return result;

tests/sksl/runtime_errors/ProgramTooLarge_BlocklessLoops.skvm

diff --git a/tests/sksl/runtime_errors/ProgramTooLarge_BlocklessLoops.skvm b/tests/sksl/runtime_errors/ProgramTooLarge_BlocklessLoops.skvm
index 68f2b9d..eb45f44 100644
--- a/tests/sksl/runtime_errors/ProgramTooLarge_BlocklessLoops.skvm
+++ b/tests/sksl/runtime_errors/ProgramTooLarge_BlocklessLoops.skvm
@@ -1,7 +1,4 @@
-1 registers, 5 instructions:
-0	r0 = splat 0 (0)
-loop:
-1	    store32 ptr1 r0
-2	    store32 ptr2 r0
-3	    store32 ptr3 r0
-4	    store32 ptr4 r0
+### Compilation failed:
+
+error: program is too large
+1 error