commit 32db19b78d3e410321afe56a33b66a02ba440f01
author Olli Etuaho <oetuaho@nvidia.com> Tue Oct 04 14:43:16 2016 +0100
committer Commit Bot <commit-bot@chromium.org> Wed Oct 05 17:29:40 2016 +0000
tree 69fdb1b84b98cf0bff26eb0106dc3140ec09be78
parent 18319182b4acdad574568a0b2dfe21ee66ea12cc

Ensure that if-else branches are always sequence nodes

This mainly affects RewriteElseBlocks, which was the only piece of
code still adding TIntermIfElse nodes directly as children of other
TIntermIfElse nodes.

BUG=angleproject:1490
TEST=angle_unittests

Change-Id: I5b25c2fb9c642424417cd6c29e37c20482c6ffaf
Reviewed-on: https://chromium-review.googlesource.com/392847
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

src/compiler/translator/IntermNode.cpp

diff --git a/src/compiler/translator/IntermNode.cpp b/src/compiler/translator/IntermNode.cpp
index e17ac56..09bc972 100644
--- a/src/compiler/translator/IntermNode.cpp
+++ b/src/compiler/translator/IntermNode.cpp
@@ -310,8 +310,8 @@
 bool TIntermIfElse::replaceChildNode(TIntermNode *original, TIntermNode *replacement)
 {
     REPLACE_IF_IS(mCondition, TIntermTyped, original, replacement);
-    REPLACE_IF_IS(mTrueBlock, TIntermNode, original, replacement);
-    REPLACE_IF_IS(mFalseBlock, TIntermNode, original, replacement);
+    REPLACE_IF_IS(mTrueBlock, TIntermAggregate, original, replacement);
+    REPLACE_IF_IS(mFalseBlock, TIntermAggregate, original, replacement);
     return false;
 }