commit 6cb95f3a235c20dbe4bb9f5de75401a16014c012
author Zhenyao Mo <zmo@chromium.org> Thu Oct 03 17:01:52 2013 -0700
committer Shannon Woods <shannonwoods@chromium.org> Mon Dec 09 20:08:44 2013 +0000
tree 01a32b6bea66e61c46dbf5e242d2955b74d309d2
parent e88dcaf333a8a583e023b1db372668af2ce8b273

Fix a traverse bug.

In loop node, the init part was skipped in traversing.

BUG=
TEST=
R=kbr@chromium.org

Review URL: https://codereview.appspot.com/14366043

Change-Id: If3200f1dbcafda1147820b2d47b758b897de0fc6
Reviewed-on: https://chromium-review.googlesource.com/178992
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Shannon Woods <shannonwoods@chromium.org>

src/compiler/translator/IntermTraverse.cpp

diff --git a/src/compiler/translator/IntermTraverse.cpp b/src/compiler/translator/IntermTraverse.cpp
index a20a5a2..0e345d2 100644
--- a/src/compiler/translator/IntermTraverse.cpp
+++ b/src/compiler/translator/IntermTraverse.cpp
@@ -211,9 +211,15 @@
 
             if (cond)
                 cond->traverse(it);
+
+            if (init)
+                init->traverse(it);
         }
         else
         {
+            if (init)
+                init->traverse(it);
+
             if (cond)
                 cond->traverse(it);
 

src/compiler/translator/MapLongVariableNames.cpp

diff --git a/src/compiler/translator/MapLongVariableNames.cpp b/src/compiler/translator/MapLongVariableNames.cpp
index b9ec983..ef629c2 100644
--- a/src/compiler/translator/MapLongVariableNames.cpp
+++ b/src/compiler/translator/MapLongVariableNames.cpp
@@ -102,13 +102,6 @@
     }
 }
 
-bool MapLongVariableNames::visitLoop(Visit, TIntermLoop* node)
-{
-    if (node->getInit())
-        node->getInit()->traverse(this);
-    return true;
-}
-
 TString MapLongVariableNames::mapGlobalLongName(const TString& name)
 {
     ASSERT(mGlobalMap);

src/compiler/translator/MapLongVariableNames.h

diff --git a/src/compiler/translator/MapLongVariableNames.h b/src/compiler/translator/MapLongVariableNames.h
index e0cdfb1..3b085a3 100644
--- a/src/compiler/translator/MapLongVariableNames.h
+++ b/src/compiler/translator/MapLongVariableNames.h
@@ -48,7 +48,6 @@
     MapLongVariableNames(LongNameMap* globalMap);
 
     virtual void visitSymbol(TIntermSymbol*);
-    virtual bool visitLoop(Visit, TIntermLoop*);
 
 private:
     TString mapGlobalLongName(const TString& name);