commit fba386b94038029eee106a7903c99f3b9a173d0f
author Brian Osman <brianosman@google.com> Thu Jun 20 14:54:15 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jun 20 19:29:40 2019 +0000
tree a7e993ac830b1b9b1d4467d05cf6754e724e5020
parent d1b2c85dcadf2e027a84df4e0d8a183c2701425f

ByteCode: Allow calls to functions that return void

Change-Id: Ia2e21bc984c509cd2405499f93ee5e19941cc492
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/222499
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

src/sksl/SkSLByteCodeGenerator.cpp

diff --git a/src/sksl/SkSLByteCodeGenerator.cpp b/src/sksl/SkSLByteCodeGenerator.cpp
index d8dcb25..4a71b0d 100644
--- a/src/sksl/SkSLByteCodeGenerator.cpp
+++ b/src/sksl/SkSLByteCodeGenerator.cpp
@@ -28,7 +28,9 @@
 
 
 int ByteCodeGenerator::SlotCount(const Type& type) {
-    if (type.kind() == Type::kStruct_Kind) {
+    if (type.kind() == Type::kOther_Kind) {
+        return 0;
+    } else if (type.kind() == Type::kStruct_Kind) {
         int slots = 0;
         for (const auto& f : type.fields()) {
             slots += SlotCount(*f.fType);
@@ -828,7 +830,7 @@
         if (count > 4) {
             this->write(ByteCodeInstruction::kPopN);
             this->write8(count);
-        } else {
+        } else if (count != 0) {
             this->write(vector_instruction(ByteCodeInstruction::kPop, count));
         }
         discard = false;