Fix PR1965: missing diagnostics for parameters that are missing

type specifiers.  This required updating some (buggy) tests, and the
testcase was previously accidentally committed.

llvm-svn: 46603

3 files changed, 20 insertions, 1 deletions

diff --git a/clang/Parse/ParseDecl.cpp b/clang/Parse/ParseDecl.cpp
index 003554fbaa9..91e77b95e09 100644
--- a/clang/Parse/ParseDecl.cpp
+++ b/clang/Parse/ParseDecl.cpp
@@ -1350,6 +1350,20 @@ void Parser::ParseParenDeclarator(Declarator &D) {
              ParmII->getName());
         ParmII = 0;
       }
+
+      // If no parameter was specified, verify that *something* was specified,
+      // otherwise we have a missing type and identifier.
+      if (!DS.hasTypeSpecifier()) {
+        if (ParmII)
+          Diag(ParmDecl.getIdentifierLoc(),
+               diag::err_param_requires_type_specifier, ParmII->getName());
+        else
+          Diag(Tok.getLocation(), diag::err_anon_param_requires_type_specifier);
+          
+        // Default the parameter to 'int'.
+        const char *PrevSpec = 0;
+        DS.SetTypeSpecType(DeclSpec::TST_int, Tok.getLocation(), PrevSpec);
+      }
         
       ParamInfo.push_back(DeclaratorChunk::ParamInfo(ParmII, 
         ParmDecl.getIdentifierLoc(), ParamTy.Val, ParmDecl.getInvalidType(),
diff --git a/clang/include/clang/Basic/DiagnosticKinds.def b/clang/include/clang/Basic/DiagnosticKinds.def
index 78f6c61c512..02d3159c6ad 100644
--- a/clang/include/clang/Basic/DiagnosticKinds.def
+++ b/clang/include/clang/Basic/DiagnosticKinds.def
@@ -542,6 +542,11 @@ DIAG(ext_vla, EXTENSION,
      "variable length arrays are a C99 feature, accepted as an extension")
 DIAG(err_invalid_storage_class_in_func_decl, ERROR,
      "invalid storage class specifier in function declarator")
+DIAG(err_anon_param_requires_type_specifier, ERROR,
+     "type specifier required for unnamed parameter")
+DIAG(err_param_requires_type_specifier, ERROR,
+     "type specifier required for parameter '%0'")
+
 DIAG(err_invalid_reference_qualifier_application, ERROR,
      "'%0' qualifier may not be applied to a reference")
 DIAG(err_declarator_need_ident, ERROR,
diff --git a/clang/test/Parser/declarators.c b/clang/test/Parser/declarators.c
index 91cd81653bf..e00035c8e0f 100644
--- a/clang/test/Parser/declarators.c
+++ b/clang/test/Parser/declarators.c
@@ -6,7 +6,7 @@ void f0();
 void f1(int [*]);
 void f2(int [const *]);
 void f3(int [volatile const*]);
-int f4(*XX)(void); /* expected-error {{cannot return}} */
+int f4(*XX)(void); /* expected-error {{cannot return}} expected-error {{type specifier required}} */
 
 char ((((*X))));