Translator: Validate multi-declarations are separated

src/compiler/translator/Compiler.cpp

@@ -561,6 +561,8 @@ bool TCompiler::checkAndSimplifyAST(TIntermBlock *root,
                                     const TParseContext &parseContext,
                                     ShCompileOptions compileOptions)
 {
+    mValidateASTOptions = {};
+
     // Disallow expressions deemed too complex.
     if ((compileOptions & SH_LIMIT_EXPRESSION_COMPLEXITY) != 0 && !limitExpressionComplexity(root))
     {

src/compiler/translator/ValidateAST.cpp

@@ -61,6 +61,9 @@ class ValidateAST : public TIntermTraverser
 
     // For validateNullNodes
     bool mNullNodesFailed = false;
+
+    // For validateMultiDeclarations
+    bool mMultiDeclarationsFailed = false;
 };
 
 bool ValidateAST::validate(TIntermNode *root,
@@ -218,6 +221,12 @@ bool ValidateAST::visitDeclaration(Visit visit, TIntermDeclaration *node)
 {
     visitNode(visit, node);
     expectNonNullChildren(visit, node, 0);
+
+    if (mOptions.validateMultiDeclarations && node->getSequence()->size() > 1)
+    {
+        mMultiDeclarationsFailed = true;
+    }
+
     return true;
 }
 
@@ -240,7 +249,7 @@ void ValidateAST::visitPreprocessorDirective(TIntermPreprocessorDirective *node)
 
 bool ValidateAST::validateInternal()
 {
-    return !mSingleParentFailed && !mNullNodesFailed;
+    return !mSingleParentFailed && !mNullNodesFailed && !mMultiDeclarationsFailed;
 }
 
 }  // anonymous namespace

src/compiler/translator/ValidateAST.h

@@ -46,7 +46,7 @@ struct ValidateASTOptions
     // Check that expression nodes have the correct type considering their operand(s).
     bool validateExpressionTypes = true;  // TODO
     // If SeparateDeclarations has been run, check for the absence of multi declarations as well.
-    bool validateMultiDeclarations = false;  // TODO
+    bool validateMultiDeclarations = false;
 };
 
 // Check for errors and output error messages on the context.