Translator: Validate MaxFunctionParameters limit during parse

Bug: angleproject:349994211
Change-Id: Ic9e4a6d1279cdfdb8d24a029182f3c83a79ef05f
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/7022016
Reviewed-by: Yuxin Hu <[email protected]>
Reviewed-by: Geoff Lang <[email protected]>
Commit-Queue: Shahbaz Youssefi <[email protected]>

Author: ShabbyX

src/compiler.gni

@@ -102,8 +102,6 @@ angle_translator_sources = [
   "src/compiler/translator/ValidateGlobalInitializer.h",
   "src/compiler/translator/ValidateLimitations.cpp",
   "src/compiler/translator/ValidateLimitations.h",
-  "src/compiler/translator/ValidateMaxParameters.cpp",
-  "src/compiler/translator/ValidateMaxParameters.h",
   "src/compiler/translator/ValidateOutputs.cpp",
   "src/compiler/translator/ValidateOutputs.h",
   "src/compiler/translator/ValidateSwitch.cpp",

src/compiler/translator/Compiler.cpp

@@ -27,7 +27,6 @@
 #include "compiler/translator/ParseContext.h"
 #include "compiler/translator/SizeClipCullDistance.h"
 #include "compiler/translator/ValidateLimitations.h"
-#include "compiler/translator/ValidateMaxParameters.h"
 #include "compiler/translator/ValidateOutputs.h"
 #include "compiler/translator/ValidateTypeSizeLimitations.h"
 #include "compiler/translator/ValidateVaryingLocations.h"
@@ -1971,12 +1970,6 @@ bool TCompiler::limitExpressionComplexity(TIntermBlock *root)
         return false;
     }
 
-    if (!ValidateMaxParameters(root, mResources.MaxFunctionParameters))
-    {
-        mDiagnostics.globalError("Function has too many parameters.");
-        return false;
-    }
-
     return true;
 }
 

src/compiler/translator/ParseContext.cpp

@@ -390,6 +390,7 @@ TParseContext::TParseContext(TSymbolTable &symt,
       mMaxAtomicCounterBufferSize(resources.MaxAtomicCounterBufferSize),
       mMaxShaderStorageBufferBindings(resources.MaxShaderStorageBufferBindings),
       mMaxPixelLocalStoragePlanes(resources.MaxPixelLocalStoragePlanes),
+      mMaxFunctionParameters(resources.MaxFunctionParameters),
       mDeclaringFunction(false),
       mDeclaringMain(false),
       mIsMainDeclared(false),
@@ -4734,8 +4735,15 @@ TIntermFunctionDefinition *TParseContext::addFunctionDefinition(
     // Check that non-void functions have at least one return statement.
     if (mCurrentFunctionType->getBasicType() != EbtVoid && !mFunctionReturnsValue)
     {
-        error(location,
-              "function does not return a value:", functionPrototype->getFunction()->name());
+        error(location, "Function does not return a value",
+              functionPrototype->getFunction()->name());
+    }
+    if (mCompileOptions.limitExpressionComplexity &&
+        functionPrototype->getFunction()->getParamCount() >
+            static_cast<unsigned int>(mMaxFunctionParameters))
+    {
+        error(location, "Function has too many parameters",
+              functionPrototype->getFunction()->name());
     }
 
     if (functionBody == nullptr)

src/compiler/translator/ParseContext.h

@@ -839,6 +839,7 @@ class TParseContext : angle::NonCopyable
     int mMaxAtomicCounterBufferSize;
     int mMaxShaderStorageBufferBindings;
     int mMaxPixelLocalStoragePlanes;
+    int mMaxFunctionParameters;
 
     // keeps track of whether any of the built-ins that can be redeclared (see
     // IsRedeclarableBuiltIn()) has been marked as invariant/precise before the possible