AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove redundant check for division-by-zero.

Browse Source 
ConstantFolder::Simplify already makes this check internally (see
SkSLConstantFolder:387). We don't need to do it here as well.
The `errors/DivideByZero.sksl` test reports the same errors as before.

Change-Id: If82d24b3c8613574b069cce0116aad4e789964c4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/395416
Commit-Queue: John Stiles <johnstiles@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
This commit is contained in:
John Stiles 2021-04-11 09:25:59 -04:00 committed by Skia Commit-Bot
parent 97186dc957
commit 652e863019
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/sksl/ir/SkSLBinaryExpression.cpp
View File

@ -164,15 +164,11 @@ std::unique_ptr<Expression> BinaryExpression::Make(const Context& context,
SkASSERT(!op.isAssignment() || Analysis::IsAssignable(*left));
SkASSERT(!op.isAssignment() || !left->type().componentType().isOpaque());
// If we can detect division-by-zero, we should synthesize an error, but our caller is still
// expecting to receive a binary expression back; don't return nullptr.
// Perform constant-folding on the expression.
const int offset = left->fOffset;
if (!ConstantFolder::ErrorOnDivideByZero(context, offset, op, *right)) {
std::unique_ptr<Expression> result = ConstantFolder::Simplify(context, offset, *left,
op, *right, *resultType);
if (result) {
return result;
}
if (std::unique_ptr<Expression> result = ConstantFolder::Simplify(context, offset, *left,
op, *right, *resultType)) {
return result;
}
if (context.fConfig->fSettings.fOptimize) {
@ -182,7 +178,7 @@ std::unique_ptr<Expression> BinaryExpression::Make(const Context& context,
// : mat * vec)
if (is_low_precision_matrix_vector_multiply(*left, op, *right, *resultType)) {
// Look up `sk_Caps.rewriteMatrixVectorMultiply`.
auto caps = Setting::Convert(context, left->fOffset, "rewriteMatrixVectorMultiply");
auto caps = Setting::Convert(context, offset, "rewriteMatrixVectorMultiply");
bool capsBitIsTrue = caps->is<BoolLiteral>() && caps->as<BoolLiteral>().value();
if (capsBitIsTrue || !caps->is<BoolLiteral>()) {