Don't search for nonexistent brackets in InitializeVariables

Array brackets are not included in ShaderVariable::name, so they don't need to be pruned from there either when using the name to look up the variable. BUG=angleproject:2267 TEST=angle_unittests --gtest_filter=*InitOutput*Array* Change-Id: I2b80a88c1d67f7f0dde12880bcfb35fb6d861cd0 Reviewed-on: https://chromium-review.googlesource.com/909109Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

Don't search for nonexistent brackets in InitializeVariables
bf107be4 · Olli Etuaho · Commit Bot · d9ed9c1a · bf107be4
Commit bf107be4 authored Feb 08, 2018 by Olli Etuaho Committed by Commit Bot Feb 13, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 10 deletions

InitializeVariables.cpp src/compiler/translator/InitializeVariables.cpp +6 -10

No files found.
--- a/src/compiler/translator/InitializeVariables.cpp
+++ b/src/compiler/translator/InitializeVariables.cpp
@@ -168,18 +168,15 @@ void InsertInitCode(TIntermSequence *mainBody,
 {
    for (const auto &var : variables)
    {
-        TString name = TString(var.name.c_str());
+        // Note that tempVariableName will reference a short-lived char array here - that's fine
-        size_t pos   = name.find_last_of('[');
+        // since we're only using it to find symbols.
-        if (pos != TString::npos)
+        ImmutableString tempVariableName(var.name.c_str(), var.name.length());
-        {
-            name = name.substr(0, pos);
-        }
        TIntermTyped *initializedSymbol = nullptr;
        if (var.isBuiltIn())
        {
-            initializedSymbol = ReferenceBuiltInVariable(ImmutableString(name.c_str()),
+            initializedSymbol =
-                                                         *symbolTable, shaderVersion);
+                ReferenceBuiltInVariable(tempVariableName, *symbolTable, shaderVersion);
            if (initializedSymbol->getQualifier() == EvqFragData &&
                !IsExtensionEnabled(extensionBehavior, TExtension::EXT_draw_buffers))
            {
@@ -195,8 +192,7 @@ void InsertInitCode(TIntermSequence *mainBody,
        }
        else
        {
-            initializedSymbol =
+            initializedSymbol = ReferenceGlobalVariable(tempVariableName, *symbolTable);
-                ReferenceGlobalVariable(ImmutableString(name.c_str()), *symbolTable);
        }
        ASSERT(initializedSymbol != nullptr);