commit 8d8b108ab6f71c73ae8635fddc51731b72e6a758
author Olli Etuaho <oetuaho@nvidia.com> Mon Jan 04 16:44:57 2016 +0200
committer Olli Etuaho <oetuaho@nvidia.com> Thu Jan 07 18:32:08 2016 +0000
tree 199857d2e91d1a71ab2770aaa61cc13ae6838545
parent 5d653186fd84a08579cec2874760fabf90681922

Disallow local function prototypes

Function prototypes should not be allowed inside other functions
according to ESSL 3.00.4 section 4.2.4.

BUG=angleproject:1068
TEST=angle_unittests,
     dEQP-GLES*.functional.shaders.functions.invalid.local_function_proto*

Change-Id: I54160da4d49b92a6cd7cbee020e67733963d4e10
Reviewed-on: https://chromium-review.googlesource.com/320091
Tryjob-Request: Olli Etuaho <oetuaho@nvidia.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Tested-by: Olli Etuaho <oetuaho@nvidia.com>

src/compiler/translator/ParseContext.cpp

diff --git a/src/compiler/translator/ParseContext.cpp b/src/compiler/translator/ParseContext.cpp
index 89317e8..235351c 100644
--- a/src/compiler/translator/ParseContext.cpp
+++ b/src/compiler/translator/ParseContext.cpp
@@ -1968,6 +1968,14 @@
     prototype->setOp(EOpPrototype);
 
     symbolTable.pop();
+
+    if (!symbolTable.atGlobalLevel())
+    {
+        // ESSL 3.00.4 section 4.2.4.
+        error(location, "local function prototype declarations are not allowed", "function");
+        recover();
+    }
+
     return prototype;
 }