commit bd747cb1e7dab169b626b140b470a6faefd13af2
author Mike Klein <mtklein@google.com> Wed Jan 13 10:29:50 2021 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jan 13 17:24:44 2021 +0000
tree ac5cc5f6960c7769fc85a046a034447da3ba709a
parent 836c2ca6a1d493a4c5da4bef5b6b9678faee5634

support 7 args in skvm::Program::eval()

On x86_64 we cap out at 6 arguments for JITing, but on arm64 we support
up to 7.  This change avoids the assert when running SkSLInterpreter
unit tests that do hit 7 arguments.

Cq-Include-Trybots: luci.skia.skia.primary:Test-Android-Clang-Pixel-CPU-Snapdragon821-arm64-Debug-All-Android,Test-Android-Clang-Pixel-CPU-Snapdragon821-arm64-Debug-All-Android_ASAN
Change-Id: I17383679fb9bce2e4ce052bcac3c694e5af77124
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/353537
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>

src/core/SkVM.cpp

diff --git a/src/core/SkVM.cpp b/src/core/SkVM.cpp
index 9426e31..bd9688f 100644
--- a/src/core/SkVM.cpp
+++ b/src/core/SkVM.cpp
@@ -2409,7 +2409,9 @@
                                 (n,a[0],a[1],a[2],a[3],a[4]);
                 case 6: return ((void(*)(int,void*,void*,void*,void*,void*,void*))jit_entry)
                                 (n,a[0],a[1],a[2],a[3],a[4],a[5]);
-                default: SkASSERT(false);  // TODO: >6 args?
+                case 7: return ((void(*)(int,void*,void*,void*,void*,void*,void*,void*))jit_entry)
+                                (n,a[0],a[1],a[2],a[3],a[4],a[5],a[6]);
+                default: SkASSERT(fImpl->strides.size() <= 7);
             }
         }
     #endif