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 <egdaniel@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
diff --git a/src/sksl/SkSLIRGenerator.cpp b/src/sksl/SkSLIRGenerator.cpp
index 0f035af..992db6e 100644
--- a/src/sksl/SkSLIRGenerator.cpp
+++ b/src/sksl/SkSLIRGenerator.cpp
@@ -984,15 +984,20 @@
const Type* falseType;
const Type* resultType;
if (!determine_binary_type(fContext, Token::EQEQ, ifTrue->fType, ifFalse->fType, &trueType,
- &falseType, &resultType, true)) {
+ &falseType, &resultType, true) || trueType != falseType) {
fErrors.error(expression.fPosition, "ternary operator result mismatch: '" +
ifTrue->fType.fName + "', '" +
ifFalse->fType.fName + "'");
return nullptr;
}
- ASSERT(trueType == falseType);
ifTrue = this->coerce(std::move(ifTrue), *trueType);
+ if (!ifTrue) {
+ return nullptr;
+ }
ifFalse = this->coerce(std::move(ifFalse), *falseType);
+ if (!ifFalse) {
+ return nullptr;
+ }
if (test->fKind == Expression::kBoolLiteral_Kind) {
// static boolean test, just return one of the branches
if (((BoolLiteral&) *test).fValue) {
diff --git a/tests/SkSLErrorTest.cpp b/tests/SkSLErrorTest.cpp
index 4dd92f3..a33e6f1 100644
--- a/tests/SkSLErrorTest.cpp
+++ b/tests/SkSLErrorTest.cpp
@@ -307,6 +307,9 @@
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) {