commit 1dded803d767f24247e47bbb85f9d83e88bceee3
author Olli Etuaho <oetuaho@nvidia.com> Thu Aug 18 18:13:13 2016 +0300
committer Commit Bot <commit-bot@chromium.org> Thu Aug 25 19:39:12 2016 +0000
tree 4c5b9fa97ef37b973d5fd15cb39f4771f61ffa25
parent 9949f04d6b5756c04e0cf441ea0c78d05be42c9c

Check multiplication validity in ParseContext

This improves separation of responsibilities in the code: ParseContext
should handle operand type validation, while TIntermBinary::promote
should ideally only determine the type of the node based on the
operation and operands.

BUG=angleproject:952
TEST=angle_unittests

Change-Id: I9a8d8ede21cdf35de631623a62194c0da5c604d2
Reviewed-on: https://chromium-review.googlesource.com/372622
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>

src/compiler/translator/RemovePow.cpp

diff --git a/src/compiler/translator/RemovePow.cpp b/src/compiler/translator/RemovePow.cpp
index 48fc1f9..db79ca5 100644
--- a/src/compiler/translator/RemovePow.cpp
+++ b/src/compiler/translator/RemovePow.cpp
@@ -60,7 +60,8 @@
         log->setLine(node->getLine());
         log->setType(x->getType());
 
-        TIntermBinary *mul = new TIntermBinary(EOpMul, y, log);
+        TOperator op       = TIntermBinary::GetMulOpBasedOnOperands(y->getType(), log->getType());
+        TIntermBinary *mul = new TIntermBinary(op, y, log);
         mul->setLine(node->getLine());
         bool valid = mul->promote();
         UNUSED_ASSERTION_VARIABLE(valid);