Store invariant varying names as ImmutableString

src/compiler/translator/CollectVariables.cpp

@@ -284,7 +284,7 @@ void CollectVariablesTraverser::recordBuiltInVaryingUsed(const ImmutableString &
         Varying info;
         setBuiltInInfoFromSymbolTable(name, &info);
         info.staticUse   = true;
-        info.isInvariant = mSymbolTable->isVaryingInvariant(name.data());
+        info.isInvariant = mSymbolTable->isVaryingInvariant(name);
         varyings->push_back(info);
         (*addedFlag) = true;
     }
@@ -677,7 +677,7 @@ Varying CollectVariablesTraverser::recordVarying(const TIntermSymbol &variable)
         case EvqFlatOut:
         case EvqCentroidOut:
         case EvqGeometryOut:
-            if (mSymbolTable->isVaryingInvariant(varying.name) || type.isInvariant())
+            if (mSymbolTable->isVaryingInvariant(variable.getName()) || type.isInvariant())
             {
                 varying.isInvariant = true;
             }

src/compiler/translator/ParseContext.cpp

@@ -2639,7 +2639,7 @@ TIntermInvariantDeclaration *TParseContext::parseInvariantDeclaration(
                                     typeQualifier.line);
     checkMemoryQualifierIsNotSpecified(typeQualifier.memoryQualifier, typeQualifier.line);
 
-    symbolTable.addInvariantVarying(std::string(identifier.data()));
+    symbolTable.addInvariantVarying(identifier);
 
     TIntermSymbol *intermSymbol = new TIntermSymbol(variable);
     intermSymbol->setLine(identifierLoc);

src/compiler/translator/SymbolTable.cpp

@@ -36,9 +36,9 @@ class TSymbolTable::TSymbolTableLevel
 
     TSymbol *find(const ImmutableString &name) const;
 
-    void addInvariantVarying(const std::string &name) { mInvariantVaryings.insert(name); }
+    void addInvariantVarying(const ImmutableString &name) { mInvariantVaryings.insert(name); }
 
-    bool isVaryingInvariant(const std::string &name)
+    bool isVaryingInvariant(const ImmutableString &name)
     {
         return (mGlobalInvariant || mInvariantVaryings.count(name) > 0);
     }
@@ -54,7 +54,7 @@ class TSymbolTable::TSymbolTableLevel
 
     tLevel level;
 
-    std::set<std::string> mInvariantVaryings;
+    std::set<ImmutableString> mInvariantVaryings;
     bool mGlobalInvariant;
 };
 
@@ -717,13 +717,13 @@ TPrecision TSymbolTable::getDefaultPrecision(TBasicType type) const
     return prec;
 }
 
-void TSymbolTable::addInvariantVarying(const std::string &originalName)
+void TSymbolTable::addInvariantVarying(const ImmutableString &originalName)
 {
     ASSERT(atGlobalLevel());
     mTable.back()->addInvariantVarying(originalName);
 }
 
-bool TSymbolTable::isVaryingInvariant(const std::string &originalName) const
+bool TSymbolTable::isVaryingInvariant(const ImmutableString &originalName) const
 {
     ASSERT(atGlobalLevel());
     return mTable.back()->isVaryingInvariant(originalName);

src/compiler/translator/SymbolTable.h

@@ -113,13 +113,13 @@ class TSymbolTable : angle::NonCopyable
 
     // This records invariant varyings declared through
     // "invariant varying_name;".
-    void addInvariantVarying(const std::string &originalName);
+    void addInvariantVarying(const ImmutableString &originalName);
 
     // If this returns false, the varying could still be invariant
     // if it is set as invariant during the varying variable
     // declaration - this piece of information is stored in the
     // variable's type, not here.
-    bool isVaryingInvariant(const std::string &originalName) const;
+    bool isVaryingInvariant(const ImmutableString &originalName) const;
 
     void setGlobalInvariant(bool invariant);