Split TIntermFunctionDefinition from TIntermAggregate
This makes the code easier to understand. Function definition nodes
always have just two children, the parameters node and the function
body node, so there was no proper reason why they should be aggregate
nodes.
As a part of this change, intermediate output is modified to print
symbol table ids of functions so that debugging function id related
functionality will be easier in the future.
After this patch, TIntermAggregate is still used for function
prototypes, function parameter lists, function calls, variable and
invariant declarations and the comma (sequence) operator.
BUG=angleproject:1490
TEST=angle_unittests, angle_end2end_tests
Change-Id: Ib88b4ca5d21abd5f126836ca5900d0baecabd19e
Reviewed-on: https://chromium-review.googlesource.com/394707
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
diff --git a/src/compiler/translator/InitializeVariables.cpp b/src/compiler/translator/InitializeVariables.cpp
index 1e87985..2deff0c 100644
--- a/src/compiler/translator/InitializeVariables.cpp
+++ b/src/compiler/translator/InitializeVariables.cpp
@@ -28,8 +28,9 @@
bool visitIfElse(Visit, TIntermIfElse *node) override { return false; }
bool visitLoop(Visit, TIntermLoop *node) override { return false; }
bool visitBranch(Visit, TIntermBranch *node) override { return false; }
+ bool visitAggregate(Visit, TIntermAggregate *node) override { return false; }
- bool visitAggregate(Visit visit, TIntermAggregate *node) override;
+ bool visitFunctionDefinition(Visit visit, TIntermFunctionDefinition *node) override;
private:
void insertInitCode(TIntermSequence *sequence);
@@ -40,31 +41,17 @@
// VariableInitializer implementation.
-bool VariableInitializer::visitAggregate(Visit visit, TIntermAggregate *node)
+bool VariableInitializer::visitFunctionDefinition(Visit visit, TIntermFunctionDefinition *node)
{
- bool visitChildren = !mCodeInserted;
- switch (node->getOp())
+ // Function definition.
+ ASSERT(visit == PreVisit);
+ if (node->getFunctionSymbolInfo()->isMain())
{
- case EOpFunction:
- {
- // Function definition.
- ASSERT(visit == PreVisit);
- if (node->getFunctionSymbolInfo()->isMain())
- {
- TIntermSequence *sequence = node->getSequence();
- ASSERT(sequence->size() == 2);
- TIntermBlock *body = (*sequence)[1]->getAsBlock();
- ASSERT(body);
- insertInitCode(body->getSequence());
- mCodeInserted = true;
- }
- break;
- }
- default:
- visitChildren = false;
- break;
+ TIntermBlock *body = node->getBody();
+ insertInitCode(body->getSequence());
+ mCodeInserted = true;
}
- return visitChildren;
+ return false;
}
void VariableInitializer::insertInitCode(TIntermSequence *sequence)