commit 56e42714d351f8ecb662136076166904b9934b71
author Ethan Nicholas <ethannicholas@google.com> Fri Apr 21 10:23:37 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Apr 21 14:46:51 2017 +0000
tree 5fcfcaaf819b1c45707999e3b6da3a55f9919e16
parent d952a9929b2dc826955249c755b6fed5627491c2

fixed 0 - x in skslc

Bug: skia:
Change-Id: Ib9bd6bdd8f339e5395157532f68bb12f5ccb4a02
Reviewed-on: https://skia-review.googlesource.com/14030
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/sksl/SkSLCompiler.cpp

diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp
index e4ab700..f5f2151 100644
--- a/src/sksl/SkSLCompiler.cpp
+++ b/src/sksl/SkSLCompiler.cpp
@@ -494,12 +494,16 @@
                         delete_right(&b, iter, outUpdated, outNeedsRescan);
                     }
                     break;
-                case Token::PLUS: // fall through
-                case Token::MINUS:
+                case Token::PLUS:
                     if (is_constant(*bin->fLeft, 0)) {
                         delete_left(&b, iter, outUpdated, outNeedsRescan);
                     }
-                    else if (is_constant(*bin->fRight, 0)) {
+                    if (is_constant(*bin->fRight, 0)) {
+                        delete_right(&b, iter, outUpdated, outNeedsRescan);
+                    }
+                    break;
+                case Token::MINUS:
+                    if (is_constant(*bin->fRight, 0)) {
                         delete_right(&b, iter, outUpdated, outNeedsRescan);
                     }
                     break;