From 2be687af58ec1f445c6380457d136562ef27155e Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Tue, 3 Jan 2017 16:44:39 -0500 Subject: fix skslc crash when ternary parameter types don't match BUG=skia:5968 Change-Id: I541c7925ac83e830bd53015961312810042046c5 Reviewed-on: https://skia-review.googlesource.com/6545 Reviewed-by: Greg Daniel Commit-Queue: Ethan Nicholas --- tests/SkSLErrorTest.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tests/SkSLErrorTest.cpp') diff --git a/tests/SkSLErrorTest.cpp b/tests/SkSLErrorTest.cpp index 4dd92f3e77..a33e6f16e6 100644 --- a/tests/SkSLErrorTest.cpp +++ b/tests/SkSLErrorTest.cpp @@ -307,6 +307,9 @@ DEF_TEST(SkSLTernaryMismatch, r) { test_failure(r, "void main() { int x = 5 > 2 ? true : 1.0; }", "error: 1: ternary operator result mismatch: 'bool', 'float'\n1 error\n"); + test_failure(r, + "void main() { int x = 5 > 2 ? vec3(1) : 1.0; }", + "error: 1: ternary operator result mismatch: 'vec3', 'float'\n1 error\n"); } DEF_TEST(SkSLInterfaceBlockStorageModifiers, r) { -- cgit v1.2.3