commit 635671dc0d00c0b6af95638a0803ce22516ece92
author Olli Etuaho <oetuaho@nvidia.com> Thu Oct 20 07:57:36 2016 -0700
committer Commit Bot <commit-bot@chromium.org> Thu Oct 20 18:43:25 2016 +0000
tree 405bb18aad3bf0058bd5ef8727fb6a0ca61e1301
parent 14ac0d77a7174fbcc8f78e123ef68f123916e831

Fix pruning empty declarations from loop headers

Empty declarations are possible in loop init expressions. Make
PruneEmptyDeclarations take this into account.

BUG=angleproject:1550
TEST=angle_unittests

Change-Id: If407babf9b6f7a26dfcf73ff345493d3e2af3f9a
Reviewed-on: https://chromium-review.googlesource.com/401147
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Geoff Lang <geofflang@chromium.org>

src/compiler/translator/PruneEmptyDeclarations.cpp

diff --git a/src/compiler/translator/PruneEmptyDeclarations.cpp b/src/compiler/translator/PruneEmptyDeclarations.cpp
index 695aa58..4763dd6 100644
--- a/src/compiler/translator/PruneEmptyDeclarations.cpp
+++ b/src/compiler/translator/PruneEmptyDeclarations.cpp
@@ -63,9 +63,17 @@
                     // float;
                     TIntermSequence emptyReplacement;
                     TIntermBlock *parentAsBlock = getParentNode()->getAsBlock();
-                    ASSERT(parentAsBlock != nullptr);
-                    mMultiReplacements.push_back(
-                        NodeReplaceWithMultipleEntry(parentAsBlock, node, emptyReplacement));
+                    // The declaration may be inside a block or in a loop init expression.
+                    ASSERT(parentAsBlock != nullptr || getParentNode()->getAsLoopNode() != nullptr);
+                    if (parentAsBlock)
+                    {
+                        mMultiReplacements.push_back(
+                            NodeReplaceWithMultipleEntry(parentAsBlock, node, emptyReplacement));
+                    }
+                    else
+                    {
+                        queueReplacement(node, nullptr, OriginalNode::IS_DROPPED);
+                    }
                 }
                 else if (sym->getType().getQualifier() != EvqGlobal &&
                          sym->getType().getQualifier() != EvqTemporary)