commit 029e8ca778848d23cb5e3b16c1d30379c79b3906
author Olli Etuaho <oetuaho@nvidia.com> Fri Feb 16 14:06:49 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Tue Feb 20 14:55:44 2018 +0000
tree 865ed56d0dcecb3aa73dec5fdfd214e9b330462d
parent 697bf65c11076fd302fca0631926cc64ae3e23b7

Add a constexpr constructor for TFunction

Access to TFunction parameters is now handled through two new members:
a pointer to a parameter array and a parameter count.

There's still also a vector pointer in TFunction for adding function
parameters one by one. This is used when parsing user-defined
functions.

TEST=angle_unittests
BUG=angleproject:2267

Change-Id: I86987ae56b7cf37f010d0651e9861789050aec2b
Reviewed-on: https://chromium-review.googlesource.com/923987
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

src/compiler/translator/SymbolTable.cpp

diff --git a/src/compiler/translator/SymbolTable.cpp b/src/compiler/translator/SymbolTable.cpp
index 49b49fc..a4110ce 100644
--- a/src/compiler/translator/SymbolTable.cpp
+++ b/src/compiler/translator/SymbolTable.cpp
@@ -174,9 +174,9 @@
     // occurance.
     if (function != firstDeclaration)
     {
-        // Swap the parameters of the previous declaration to the parameters of the function
-        // definition (parameter names may differ).
-        firstDeclaration->swapParameters(*function);
+        // The previous declaration should have the same parameters as the function definition
+        // (parameter names may differ).
+        firstDeclaration->shareParameters(*function);
     }
 
     *wasDefinedOut = firstDeclaration->isDefined();
@@ -591,30 +591,32 @@
     }
     else
     {
-        TFunction *function =
-            new TFunction(this, ImmutableString(name), rvalue, SymbolType::BuiltIn, false, op, ext);
-
-        function->addParameter(TConstParameter(ptype1));
+        size_t paramCount       = 1;
+        TConstParameter *params = new TConstParameter[5];
+        new (params) TConstParameter(ptype1);
 
         if (ptype2)
         {
-            function->addParameter(TConstParameter(ptype2));
+            new (params + 1) TConstParameter(ptype2);
+            paramCount = 2;
         }
-
         if (ptype3)
         {
-            function->addParameter(TConstParameter(ptype3));
+            new (params + 2) TConstParameter(ptype3);
+            paramCount = 3;
         }
-
         if (ptype4)
         {
-            function->addParameter(TConstParameter(ptype4));
+            new (params + 3) TConstParameter(ptype4);
+            paramCount = 4;
         }
-
         if (ptype5)
         {
-            function->addParameter(TConstParameter(ptype5));
+            new (params + 4) TConstParameter(ptype5);
+            paramCount = 5;
         }
+        TFunction *function =
+            new TFunction(this, ImmutableString(name), ext, params, paramCount, rvalue, op, false);
 
         ASSERT(hasUnmangledBuiltInAtLevel(name, level));
         insert(level, function);
@@ -658,8 +660,8 @@
                                                      const char *name)
 {
     insertUnmangledBuiltInName(name, level);
-    insert(level,
-           new TFunction(this, ImmutableString(name), rvalue, SymbolType::BuiltIn, false, op));
+    insert(level, new TFunction(this, ImmutableString(name), TExtension::UNDEFINED, nullptr, 0,
+                                rvalue, op, false));
 }
 
 void TSymbolTable::insertBuiltInFunctionNoParametersExt(ESymbolLevel level,
@@ -669,8 +671,7 @@
                                                         const char *name)
 {
     insertUnmangledBuiltInName(name, level);
-    insert(level,
-           new TFunction(this, ImmutableString(name), rvalue, SymbolType::BuiltIn, false, op, ext));
+    insert(level, new TFunction(this, ImmutableString(name), ext, nullptr, 0, rvalue, op, false));
 }
 
 void TSymbolTable::setDefaultPrecision(TBasicType type, TPrecision prec)