commit a5e693afbf5213052f096a36ae7e0b1acc3e1922
author Olli Etuaho <oetuaho@nvidia.com> Thu Jul 13 16:07:26 2017 +0300
committer Commit Bot <commit-bot@chromium.org> Wed Jul 19 08:33:20 2017 +0000
tree 36114ff004c418c68494852de8b71573f99f1f05
parent e5285d298fb6608372fc2e4ce4707fa978b89762

Make unique id counter a member of TSymbolTable

This makes unique id counting thread-safe.

BUG=angleproject:624
TEST=angle_unittests

Change-Id: Ie0f2c7e574470b39750d37d2181c790bc874b275
Reviewed-on: https://chromium-review.googlesource.com/570419
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/compiler/translator/Compiler.cpp

diff --git a/src/compiler/translator/Compiler.cpp b/src/compiler/translator/Compiler.cpp
index 17acebf..3c3983a 100644
--- a/src/compiler/translator/Compiler.cpp
+++ b/src/compiler/translator/Compiler.cpp
@@ -241,8 +241,7 @@
       builtInFunctionEmulator(),
       mDiagnostics(infoSink.info),
       mSourcePath(nullptr),
-      mComputeShaderLocalSizeDeclared(false),
-      mTemporaryId()
+      mComputeShaderLocalSizeDeclared(false)
 {
     mComputeShaderLocalSize.fill(1);
 }
@@ -395,7 +394,7 @@
 
         if (success && shouldRunLoopAndIndexingValidation(compileOptions))
             success =
-                ValidateLimitations(root, shaderType, symbolTable, shaderVersion, &mDiagnostics);
+                ValidateLimitations(root, shaderType, &symbolTable, shaderVersion, &mDiagnostics);
 
         bool multiview2 = IsExtensionEnabled(extensionBehavior, "GL_OVR_multiview2");
         if (success && compileResources.OVR_multiview && IsWebGLBasedSpec(shaderSpec) &&
@@ -432,12 +431,12 @@
             parseContext.isMultiviewExtensionEnabled() && getShaderType() != GL_COMPUTE_SHADER)
         {
             DeclareAndInitBuiltinsForInstancedMultiview(root, mNumViews, shaderType, compileOptions,
-                                                        outputType, symbolTable);
+                                                        outputType, &symbolTable);
         }
 
         // This pass might emit short circuits so keep it before the short circuit unfolding
         if (success && (compileOptions & SH_REWRITE_DO_WHILE_LOOPS))
-            RewriteDoWhile(root, getTemporaryId());
+            RewriteDoWhile(root, &symbolTable);
 
         if (success && (compileOptions & SH_ADD_AND_TRUE_TO_LOOP_CONDITION))
             sh::AddAndTrueToLoopCondition(root);
@@ -458,7 +457,7 @@
         {
             ASSERT(!variablesCollected);
             CollectVariables(root, &attributes, &outputVariables, &uniforms, &varyings,
-                             &interfaceBlocks, hashFunction, symbolTable, shaderVersion,
+                             &interfaceBlocks, hashFunction, &symbolTable, shaderVersion,
                              extensionBehavior);
             variablesCollected = true;
             if (compileOptions & SH_USE_UNUSED_STANDARD_SHARED_BLOCKS)
@@ -504,12 +503,12 @@
         if (success && (compileOptions & SH_SCALARIZE_VEC_AND_MAT_CONSTRUCTOR_ARGS))
         {
             ScalarizeVecAndMatConstructorArgs(root, shaderType, fragmentPrecisionHigh,
-                                              getTemporaryId());
+                                              &symbolTable);
         }
 
         if (success && (compileOptions & SH_REGENERATE_STRUCT_NAMES))
         {
-            RegenerateStructNames gen(symbolTable, shaderVersion);
+            RegenerateStructNames gen(&symbolTable, shaderVersion);
             root->traverse(&gen);
         }
 
@@ -518,7 +517,7 @@
             IsExtensionEnabled(extensionBehavior, "GL_EXT_draw_buffers"))
         {
             EmulateGLFragColorBroadcast(root, compileResources.MaxDrawBuffers, &outputVariables,
-                                        symbolTable, shaderVersion);
+                                        &symbolTable, shaderVersion);
         }
 
         if (success)
@@ -541,7 +540,7 @@
                                        IntermNodePatternMatcher::kMultiDeclaration |
                                            IntermNodePatternMatcher::kArrayDeclaration |
                                            IntermNodePatternMatcher::kNamelessStructDeclaration,
-                                       getTemporaryId(), getSymbolTable(), getShaderVersion());
+                                       &getSymbolTable(), getShaderVersion());
             }
             // We only really need to separate array declarations and nameless struct declarations,
             // but it's simpler to just use the regular SeparateDeclarations.
@@ -748,7 +747,6 @@
     nameMap.clear();
 
     mSourcePath     = nullptr;
-    mTemporaryId    = TSymbolUniqueId();
 }
 
 bool TCompiler::initCallDag(TIntermNode *root)