commit dbfdca8fd2de7b4ef7ec05161e02d4732fefee73
author Jeff Muizelaar <jmuizelaar@mozilla.com> Fri Nov 06 12:46:30 2015 -0500
committer Jamie Madill <jmadill@chromium.org> Fri Nov 06 17:48:14 2015 +0000
tree fc0eed13f96fe3d6d8df11f0e5e5b6af33a1e22f
parent fe80abac11d6f6b1ee54ac87b611dde298ce56b5

Hash interface block names and field names.

BUG=544853

Change-Id: I4ca77ed87c15a168c696c15f2438ad21c00985f6
Reviewed-on: https://chromium-review.googlesource.com/310271
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/compiler/translator/VariableInfo.cpp

diff --git a/src/compiler/translator/VariableInfo.cpp b/src/compiler/translator/VariableInfo.cpp
index 7413dc3..eb2a2d8 100644
--- a/src/compiler/translator/VariableInfo.cpp
+++ b/src/compiler/translator/VariableInfo.cpp
@@ -551,7 +551,8 @@
     ASSERT(blockType);
 
     interfaceBlock.name = blockType->name().c_str();
-    interfaceBlock.mappedName = TIntermTraverser::hash(variable->getSymbol(), mHashFunction).c_str();
+    interfaceBlock.mappedName =
+        TIntermTraverser::hash(blockType->name().c_str(), mHashFunction).c_str();
     interfaceBlock.instanceName = (blockType->hasInstanceName() ? blockType->instanceName().c_str() : "");
     interfaceBlock.arraySize = variable->getArraySize();
     interfaceBlock.isRowMajorLayout = (blockType->matrixPacking() == EmpRowMajor);
@@ -566,7 +567,7 @@
         const TString &fullFieldName = InterfaceBlockFieldName(*blockType, field);
         const TType &fieldType = *field.type();
 
-        GetVariableTraverser traverser(mSymbolTable);
+        NameHashingTraverser traverser(mHashFunction, mSymbolTable);
         traverser.traverse(fieldType, fullFieldName, &interfaceBlock.fields);
 
         interfaceBlock.fields.back().isRowMajorLayout = (fieldType.getLayoutQualifier().matrixPacking == EmpRowMajor);