commit b2983c9558c5793cdb668fe49f3d5798f95c36d2
author Olli Etuaho <oetuaho@nvidia.com> Wed Mar 18 14:02:46 2015 +0200
committer Olli Etuaho <oetuaho@nvidia.com> Thu Mar 19 14:36:53 2015 +0000
tree 66ae41bda3bee558212d71f72be628dd478096be
parent 5659619ad230f7e91ec4fefddc11b28f834b9a53

Correctly insert unmangled function names to symbol table

This fixes detecting some cases of function parameter mismatch
(previously a mangled function name corresponding to no function
parameters was added to the symbol table for each user-defined function,
and this was returned when doing function lookups with no parameters).

Also fixes detection of reusing a function name as a variable/struct
name.

New unit tests are added to ensure that these fixes don't regress.

BUG=angleproject:936
TEST=angle_unittests, WebGL conformance tests

Change-Id: I2dadde9dcc01c7a4a653c1982c36377b89e6d437
Reviewed-on: https://chromium-review.googlesource.com/260800
Tested-by: Olli Etuaho <oetuaho@nvidia.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/compiler/translator/SymbolTable.cpp

diff --git a/src/compiler/translator/SymbolTable.cpp b/src/compiler/translator/SymbolTable.cpp
index 4b2c19f..0eb663f 100644
--- a/src/compiler/translator/SymbolTable.cpp
+++ b/src/compiler/translator/SymbolTable.cpp
@@ -48,6 +48,16 @@
     return result.second;
 }
 
+bool TSymbolTableLevel::insertUnmangled(TFunction *function)
+{
+    function->setUniqueId(TSymbolTable::nextUniqueId());
+
+    // returning true means symbol was added to the table
+    tInsertResult result = level.insert(tLevelPair(function->getName(), function));
+
+    return result.second;
+}
+
 TSymbol *TSymbolTableLevel::find(const TString &name) const
 {
     tLevel::const_iterator it = level.find(name);

src/compiler/translator/SymbolTable.h

diff --git a/src/compiler/translator/SymbolTable.h b/src/compiler/translator/SymbolTable.h
index 8e2dfd7..397e4d6 100644
--- a/src/compiler/translator/SymbolTable.h
+++ b/src/compiler/translator/SymbolTable.h
@@ -288,6 +288,9 @@
 
     bool insert(TSymbol *symbol);
 
+    // Insert a function using its unmangled name as the key.
+    bool insertUnmangled(TFunction *function);
+
     TSymbol *find(const TString &name) const;
 
   protected:

src/compiler/translator/glslang.y

diff --git a/src/compiler/translator/glslang.y b/src/compiler/translator/glslang.y
index ccfa08b..47143c2 100644
--- a/src/compiler/translator/glslang.y
+++ b/src/compiler/translator/glslang.y
@@ -710,7 +710,7 @@
         {
             // Insert the unmangled name to detect potential future redefinition as a variable.
             TFunction *function = new TFunction(NewPoolTString($1->getName().c_str()), $1->getReturnType());
-            context->symbolTable.getOuterLevel()->insert(function);
+            context->symbolTable.getOuterLevel()->insertUnmangled(function);
         }
 
         //

src/compiler/translator/glslang_tab.cpp

diff --git a/src/compiler/translator/glslang_tab.cpp b/src/compiler/translator/glslang_tab.cpp
index e5ab8e1..6ef67cf 100644
--- a/src/compiler/translator/glslang_tab.cpp
+++ b/src/compiler/translator/glslang_tab.cpp
@@ -3168,7 +3168,7 @@
         {
             // Insert the unmangled name to detect potential future redefinition as a variable.
             TFunction *function = new TFunction(NewPoolTString((yyvsp[-1].interm.function)->getName().c_str()), (yyvsp[-1].interm.function)->getReturnType());
-            context->symbolTable.getOuterLevel()->insert(function);
+            context->symbolTable.getOuterLevel()->insertUnmangled(function);
         }
 
         //