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/Intermediate.cpp

diff --git a/src/compiler/translator/Intermediate.cpp b/src/compiler/translator/Intermediate.cpp
index cd9712e..57d53bf 100644
--- a/src/compiler/translator/Intermediate.cpp
+++ b/src/compiler/translator/Intermediate.cpp
@@ -142,11 +142,10 @@
 //
 // Returns an aggregate, unless NULL was passed in for the existing node.
 //
-TIntermAggregate *TIntermediate::makeAggregate(
-    TIntermNode *node, const TSourceLoc &line)
+TIntermAggregate *TIntermediate::MakeAggregate(TIntermNode *node, const TSourceLoc &line)
 {
-    if (node == NULL)
-        return NULL;
+    if (node == nullptr)
+        return nullptr;
 
     TIntermAggregate *aggNode = new TIntermAggregate;
     aggNode->getSequence()->push_back(node);
@@ -159,7 +158,7 @@
 // If the input node is nullptr, return nullptr.
 // If the input node is a sequence (block) node, return it.
 // If the input node is not a sequence node, put it inside a sequence node and return that.
-TIntermAggregate *TIntermediate::ensureSequence(TIntermNode *node)
+TIntermAggregate *TIntermediate::EnsureSequence(TIntermNode *node)
 {
     if (node == nullptr)
         return nullptr;
@@ -167,7 +166,7 @@
     if (aggNode != nullptr && aggNode->getOp() == EOpSequence)
         return aggNode;
 
-    aggNode = makeAggregate(node, node->getLine());
+    aggNode = MakeAggregate(node, node->getLine());
     aggNode->setOp(EOpSequence);
     return aggNode;
 }
@@ -200,7 +199,7 @@
     }
 
     TIntermIfElse *node =
-        new TIntermIfElse(cond, ensureSequence(nodePair.node1), ensureSequence(nodePair.node2));
+        new TIntermIfElse(cond, EnsureSequence(nodePair.node1), EnsureSequence(nodePair.node2));
     node->setLine(line);
 
     return node;
@@ -332,7 +331,7 @@
     TLoopType type, TIntermNode *init, TIntermTyped *cond, TIntermTyped *expr,
     TIntermNode *body, const TSourceLoc &line)
 {
-    TIntermNode *node = new TIntermLoop(type, init, cond, expr, ensureSequence(body));
+    TIntermNode *node = new TIntermLoop(type, init, cond, expr, EnsureSequence(body));
     node->setLine(line);
 
     return node;