commit d8ca6b608e4471e7c587ea0747cde6405ff7b754
author John Stiles <johnstiles@google.com> Mon Nov 23 14:28:36 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Nov 25 15:13:27 2020 +0000
tree 40fc7624988fbd94314c002f6d4354af2a0932b1
parent 3e2e7b28b699a11cf29b15bba62cf6fce885d60b

Replace SPIR-V assertion with mixed-types error message.

This is very unlikely to occur in real-world code, as it's somewhat
nonsense to use the comma operator in this way. However, it's better to
fail cleanly than to assert.

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

src/sksl/SkSLSPIRVCodeGenerator.cpp

diff --git a/src/sksl/SkSLSPIRVCodeGenerator.cpp b/src/sksl/SkSLSPIRVCodeGenerator.cpp
index 7d67e9c..e4b8390 100644
--- a/src/sksl/SkSLSPIRVCodeGenerator.cpp
+++ b/src/sksl/SkSLSPIRVCodeGenerator.cpp
@@ -2198,7 +2198,7 @@
             }
             return result;
         } else {
-            SkASSERT(false);
+            fErrors.error(leftType.fOffset, "unsupported mixed-type expression");
             return -1;
         }
     } else {