Remove TIntermSymbol::setId

The only place it was being used was when parsing array declarators. The declarator only needs to be added to the AST when the variable has successfully been declared, so this usage was not necessary. BUG=angleproject:1490 TEST=angle_unittests Change-Id: I05b8851cfdebc9253c9fda8b12733f23da604ca6 Reviewed-on: https://chromium-review.googlesource.com/569160Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

Remove TIntermSymbol::setId
d7ceaa16 · Olli Etuaho · Commit Bot · d178aa46 · d7ceaa16 · d7ceaa16
Commit d7ceaa16 authored Jul 12, 2017 by Olli Etuaho Committed by Commit Bot Jul 13, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 10 deletions

IntermNode.h src/compiler/translator/IntermNode.h +1 -3

ParseContext.cpp src/compiler/translator/ParseContext.cpp +6 -5

Types.h src/compiler/translator/Types.h +0 -2

No files found.
--- a/src/compiler/translator/IntermNode.h
+++ b/src/compiler/translator/IntermNode.h
@@ -270,8 +270,6 @@ class TIntermSymbol : public TIntermTyped
    const TName &getName() const { return mSymbol; }
    TName &getName() { return mSymbol; }
-    void setId(int newId) { mId = newId; }
    void setInternal(bool internal) { mSymbol.setInternal(internal); }
    void traverse(TIntermTraverser *it) override;
@@ -279,7 +277,7 @@ class TIntermSymbol : public TIntermTyped
    bool replaceChildNode(TIntermNode *, TIntermNode *) override { return false; }
  protected:
-    int mId;
+    const int mId;
    TName mSymbol;
  private:

--- a/src/compiler/translator/ParseContext.cpp
+++ b/src/compiler/translator/ParseContext.cpp
@@ -2480,12 +2480,13 @@ void TParseContext::parseArrayDeclarator(TPublicType &publicType,
        TVariable *variable = nullptr;
        declareVariable(identifierLocation, identifier, arrayType, &variable);
-        TIntermSymbol *symbol = new TIntermSymbol(0, identifier, arrayType);
-        symbol->setLine(identifierLocation);
        if (variable)
-            symbol->setId(variable->getUniqueId());
+        {
+            TIntermSymbol *symbol =
-        declarationOut->appendDeclarator(symbol);
+                new TIntermSymbol(variable->getUniqueId(), identifier, arrayType);
+            symbol->setLine(identifierLocation);
+            declarationOut->appendDeclarator(symbol);
+        }
    }
 }

--- a/src/compiler/translator/Types.h
+++ b/src/compiler/translator/Types.h
@@ -107,8 +107,6 @@ class TStructure : public TFieldListCollection
    bool equals(const TStructure &other) const;
-    void setUniqueId(int uniqueId) { mUniqueId = uniqueId; }
    int uniqueId() const
    {
        ASSERT(mUniqueId != 0);