OSDN Git Service

Validate that all function-like-macro arguments are unique.
authorNicolas Capens <capn@google.com>
Fri, 22 Apr 2016 13:49:29 +0000 (09:49 -0400)
committerNicolas Capens <capn@google.com>
Fri, 22 Apr 2016 19:03:25 +0000 (19:03 +0000)
Change-Id: Idc8c2a241af91916857ba015b061ce655b33e866
Reviewed-on: https://swiftshader-review.googlesource.com/5179
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
src/OpenGL/compiler/preprocessor/Diagnostics.cpp
src/OpenGL/compiler/preprocessor/Diagnostics.h
src/OpenGL/compiler/preprocessor/DirectiveParser.cpp

index c6e6758..b6888b9 100644 (file)
-//\r
-// Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.\r
-// Use of this source code is governed by a BSD-style license that can be\r
-// found in the LICENSE file.\r
-//\r
-\r
-#include "Diagnostics.h"\r
-\r
-#include <cassert>\r
-\r
-namespace pp\r
-{\r
-\r
-Diagnostics::~Diagnostics()\r
-{\r
-}\r
-\r
-void Diagnostics::report(ID id,\r
-                         const SourceLocation& loc,\r
-                         const std::string& text)\r
-{\r
-    // TODO(alokp): Keep a count of errors and warnings.\r
-    print(id, loc, text);\r
-}\r
-\r
-Diagnostics::Severity Diagnostics::severity(ID id)\r
-{\r
-    if ((id > ERROR_BEGIN) && (id < ERROR_END))\r
-        return PP_ERROR;\r
-\r
-    if ((id > WARNING_BEGIN) && (id < WARNING_END))\r
-        return PP_WARNING;\r
-\r
-    assert(false);\r
-    return PP_ERROR;\r
-}\r
-\r
-std::string Diagnostics::message(ID id)\r
-{\r
-    switch (id)\r
-    {\r
-      // Errors begin.\r
-      case INTERNAL_ERROR:\r
-          return "internal error";\r
-      case OUT_OF_MEMORY:\r
-          return "out of memory";\r
-      case INVALID_CHARACTER:\r
-          return "invalid character";\r
-      case INVALID_NUMBER:\r
-          return "invalid number";\r
-      case INTEGER_OVERFLOW:\r
-          return "integer overflow";\r
-      case FLOAT_OVERFLOW:\r
-          return "float overflow";\r
-      case TOKEN_TOO_LONG:\r
-          return "token too long";\r
-      case INVALID_EXPRESSION:\r
-          return "invalid expression";\r
-      case DIVISION_BY_ZERO:\r
-          return "division by zero";\r
-      case EOF_IN_COMMENT:\r
-          return "unexpected end of file found in comment";\r
-      case UNEXPECTED_TOKEN:\r
-          return "unexpected token";\r
-      case DIRECTIVE_INVALID_NAME:\r
-          return "invalid directive name";\r
-      case MACRO_NAME_RESERVED:\r
-          return "macro name is reserved";\r
-      case MACRO_REDEFINED:\r
-          return "macro redefined";\r
-      case MACRO_PREDEFINED_REDEFINED:\r
-          return "predefined macro redefined";\r
-      case MACRO_PREDEFINED_UNDEFINED:\r
-          return "predefined macro undefined";\r
-      case MACRO_UNTERMINATED_INVOCATION:\r
-          return "unterminated macro invocation";\r
-      case MACRO_TOO_FEW_ARGS:\r
-          return "Not enough arguments for macro";\r
-      case MACRO_TOO_MANY_ARGS:\r
-          return "Too many arguments for macro";\r
-      case CONDITIONAL_ENDIF_WITHOUT_IF:\r
-          return "unexpected #endif found without a matching #if";\r
-      case CONDITIONAL_ELSE_WITHOUT_IF:\r
-          return "unexpected #else found without a matching #if";\r
-      case CONDITIONAL_ELSE_AFTER_ELSE:\r
-          return "unexpected #else found after another #else";\r
-      case CONDITIONAL_ELIF_WITHOUT_IF:\r
-          return "unexpected #elif found without a matching #if";\r
-      case CONDITIONAL_ELIF_AFTER_ELSE:\r
-          return "unexpected #elif found after #else";\r
-      case CONDITIONAL_UNTERMINATED:\r
-          return "unexpected end of file found in conditional block";\r
-      case INVALID_EXTENSION_NAME:\r
-          return "invalid extension name";\r
-      case INVALID_EXTENSION_BEHAVIOR:\r
-          return "invalid extension behavior";\r
-      case INVALID_EXTENSION_DIRECTIVE:\r
-          return "invalid extension directive";\r
-      case INVALID_VERSION_NUMBER:\r
-          return "invalid version number";\r
-      case INVALID_VERSION_DIRECTIVE:\r
-          return "invalid version directive";\r
-      case VERSION_NOT_FIRST_STATEMENT:\r
-        return "#version directive must occur before anything else, "\r
-               "except for comments and white space";\r
-      case INVALID_LINE_NUMBER:\r
-          return "invalid line number";\r
-      case INVALID_FILE_NUMBER:\r
-          return "invalid file number";\r
-      case INVALID_LINE_DIRECTIVE:\r
-          return "invalid line directive";\r
-      case UNDEFINED_IDENTIFIER:\r
-          return "undefined identifier";\r
-      // Errors end.\r
-      // Warnings begin.\r
-      case EOF_IN_DIRECTIVE:\r
-          return "unexpected end of file found in directive";\r
-      case CONDITIONAL_UNEXPECTED_TOKEN:\r
-          return "unexpected token after conditional expression";\r
-      case UNRECOGNIZED_PRAGMA:\r
-          return "unrecognized pragma";\r
-      // Warnings end.\r
-      default:\r
-          assert(false);\r
-          return "";\r
-    }\r
-}\r
-\r
-}  // namespace pp\r
+//
+// Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+
+#include "Diagnostics.h"
+
+#include <cassert>
+
+namespace pp
+{
+
+Diagnostics::~Diagnostics()
+{
+}
+
+void Diagnostics::report(ID id,
+                         const SourceLocation& loc,
+                         const std::string& text)
+{
+    // TODO(alokp): Keep a count of errors and warnings.
+    print(id, loc, text);
+}
+
+Diagnostics::Severity Diagnostics::severity(ID id)
+{
+    if ((id > ERROR_BEGIN) && (id < ERROR_END))
+        return PP_ERROR;
+
+    if ((id > WARNING_BEGIN) && (id < WARNING_END))
+        return PP_WARNING;
+
+    assert(false);
+    return PP_ERROR;
+}
+
+std::string Diagnostics::message(ID id)
+{
+    switch (id)
+    {
+      // Errors begin.
+      case INTERNAL_ERROR:
+          return "internal error";
+      case OUT_OF_MEMORY:
+          return "out of memory";
+      case INVALID_CHARACTER:
+          return "invalid character";
+      case INVALID_NUMBER:
+          return "invalid number";
+      case INTEGER_OVERFLOW:
+          return "integer overflow";
+      case FLOAT_OVERFLOW:
+          return "float overflow";
+      case TOKEN_TOO_LONG:
+          return "token too long";
+      case INVALID_EXPRESSION:
+          return "invalid expression";
+      case DIVISION_BY_ZERO:
+          return "division by zero";
+      case EOF_IN_COMMENT:
+          return "unexpected end of file found in comment";
+      case UNEXPECTED_TOKEN:
+          return "unexpected token";
+      case DIRECTIVE_INVALID_NAME:
+          return "invalid directive name";
+      case MACRO_NAME_RESERVED:
+          return "macro name is reserved";
+      case MACRO_REDEFINED:
+          return "macro redefined";
+      case MACRO_PREDEFINED_REDEFINED:
+          return "predefined macro redefined";
+      case MACRO_PREDEFINED_UNDEFINED:
+          return "predefined macro undefined";
+      case MACRO_UNTERMINATED_INVOCATION:
+          return "unterminated macro invocation";
+      case MACRO_TOO_FEW_ARGS:
+          return "Not enough arguments for macro";
+      case MACRO_TOO_MANY_ARGS:
+          return "Too many arguments for macro";
+      case MACRO_DUPLICATE_PARAMETER_NAMES:
+          return "duplicate macro parameter name";
+      case CONDITIONAL_ENDIF_WITHOUT_IF:
+          return "unexpected #endif found without a matching #if";
+      case CONDITIONAL_ELSE_WITHOUT_IF:
+          return "unexpected #else found without a matching #if";
+      case CONDITIONAL_ELSE_AFTER_ELSE:
+          return "unexpected #else found after another #else";
+      case CONDITIONAL_ELIF_WITHOUT_IF:
+          return "unexpected #elif found without a matching #if";
+      case CONDITIONAL_ELIF_AFTER_ELSE:
+          return "unexpected #elif found after #else";
+      case CONDITIONAL_UNTERMINATED:
+          return "unexpected end of file found in conditional block";
+      case INVALID_EXTENSION_NAME:
+          return "invalid extension name";
+      case INVALID_EXTENSION_BEHAVIOR:
+          return "invalid extension behavior";
+      case INVALID_EXTENSION_DIRECTIVE:
+          return "invalid extension directive";
+      case INVALID_VERSION_NUMBER:
+          return "invalid version number";
+      case INVALID_VERSION_DIRECTIVE:
+          return "invalid version directive";
+      case VERSION_NOT_FIRST_STATEMENT:
+        return "#version directive must occur before anything else, "
+               "except for comments and white space";
+      case INVALID_LINE_NUMBER:
+          return "invalid line number";
+      case INVALID_FILE_NUMBER:
+          return "invalid file number";
+      case INVALID_LINE_DIRECTIVE:
+          return "invalid line directive";
+      case UNDEFINED_IDENTIFIER:
+          return "undefined identifier";
+      // Errors end.
+      // Warnings begin.
+      case EOF_IN_DIRECTIVE:
+          return "unexpected end of file found in directive";
+      case CONDITIONAL_UNEXPECTED_TOKEN:
+          return "unexpected token after conditional expression";
+      case UNRECOGNIZED_PRAGMA:
+          return "unrecognized pragma";
+      // Warnings end.
+      default:
+          assert(false);
+          return "";
+    }
+}
+
+}  // namespace pp
index cb87101..8ca62c9 100644 (file)
@@ -46,6 +46,7 @@ class Diagnostics
         MACRO_UNTERMINATED_INVOCATION,\r
         MACRO_TOO_FEW_ARGS,\r
         MACRO_TOO_MANY_ARGS,\r
+        MACRO_DUPLICATE_PARAMETER_NAMES,\r
         CONDITIONAL_ENDIF_WITHOUT_IF,\r
         CONDITIONAL_ELSE_WITHOUT_IF,\r
         CONDITIONAL_ELSE_AFTER_ELSE,\r
index 262d4e8..a76b5f4 100644 (file)
@@ -361,6 +361,14 @@ void DirectiveParser::parseDefine(Token* token)
             mTokenizer->lex(token);\r
             if (token->type != Token::IDENTIFIER)\r
                 break;\r
+\r
+            if (std::find(macro.parameters.begin(), macro.parameters.end(), token->text) != macro.parameters.end())\r
+            {\r
+                mDiagnostics->report(Diagnostics::MACRO_DUPLICATE_PARAMETER_NAMES,\r
+                                     token->location, token->text);\r
+                return;\r
+            }\r
+\r
             macro.parameters.push_back(token->text);\r
 \r
             mTokenizer->lex(token);  // Get ','.\r