Make "implicit int" an error in C++ (unless we're allowing Microsoft

extensions). This caught a couple bugs in our test suite :)


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64686 91177308-0d34-0410-b5e6-96231b3b80d8

4 files changed, 23 insertions, 12 deletions

diff --git a/include/clang/Basic/DiagnosticSemaKinds.def b/include/clang/Basic/DiagnosticSemaKinds.def
index cdb7f62d72..af4c7f5aa4 100644
--- a/include/clang/Basic/DiagnosticSemaKinds.def
+++ b/include/clang/Basic/DiagnosticSemaKinds.def
@@ -1375,6 +1375,8 @@ DIAG(ext_missing_declspec, EXTENSION,
      "declaration specifier missing, defaulting to 'int'")
 DIAG(ext_missing_type_specifier, EXTENSION,
      "type specifier missing, defaults to 'int'")
+DIAG(err_missing_type_specifier, ERROR,
+     "C++ requires a type specifier for all declarations")
 DIAG(warn_objc_array_of_interfaces, WARNING,
      "array of interface %0 should probably be an array of pointers")
 DIAG(ext_c99_array_usage, EXTENSION,
diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp
index 021e18e5d7..9a575ced9e 100644
--- a/lib/Sema/SemaType.cpp
+++ b/lib/Sema/SemaType.cpp
@@ -79,14 +79,16 @@ QualType Sema::ConvertDeclSpecToType(const DeclSpec &DS) {
                                        DeclSpec::PQ_TypeSpecifier |
                                        DeclSpec::PQ_TypeQualifier)) == 0)
         Diag(DS.getSourceRange().getBegin(), diag::ext_missing_declspec);
-    } else {
+    } else if (!DS.hasTypeSpecifier()) {
       // C99 and C++ require a type specifier.  For example, C99 6.7.2p2 says:
       // "At least one type specifier shall be given in the declaration
       // specifiers in each declaration, and in the specifier-qualifier list in
       // each struct declaration and type name."
-      // FIXME: this should be a hard error in C++
-      if (!DS.hasTypeSpecifier())
-        Diag(DS.getSourceRange().getBegin(), diag::ext_missing_type_specifier);
+      // FIXME: Does Microsoft really have the implicit int extension in C++?
+      unsigned DK = getLangOptions().CPlusPlus && !getLangOptions().Microsoft?
+          diag::err_missing_type_specifier
+        : diag::ext_missing_type_specifier;
+      Diag(DS.getSourceRange().getBegin(), DK);
     }
       
     // FALL THROUGH.  
diff --git a/test/Parser/cxx-template-decl.cpp b/test/Parser/cxx-template-decl.cpp
index 54d1081b42..ce617fb7a2 100644
--- a/test/Parser/cxx-template-decl.cpp
+++ b/test/Parser/cxx-template-decl.cpp
@@ -2,9 +2,11 @@
 
 // Errors
 export class foo { };   // expected-error {{expected template}}
-template  x;            // expected-error {{expected '<' after 'template'}}
+template  x;            // expected-error {{expected '<' after 'template'}} \
+// expected-error {{C++ requires a type specifier for all declarations}}
 export template x;      // expected-error {{expected '<' after 'template'}} \
-                        // expected-note {{exported templates are unsupported}}
+                        // expected-note {{exported templates are unsupported}} \
+// expected-error {{C++ requires a type specifier for all declarations}}
 // See Sema::ParsedFreeStandingDeclSpec about the double diagnostic. This is
 // because ParseNonTypeTemplateParameter starts parsing a DeclSpec.
 template < ;            // expected-error {{parse error}} expected-error {{declaration does not declare anything}}
@@ -26,8 +28,8 @@ template <typename> struct C;
 template <typename, typename> struct D;
 
 // Forward declarations with default parameters?
-template <typename T = int> X1;
-template <typename = int> X2;
+template <typename T = int> class X1;
+template <typename = int> class X2;
 
 // Forward declarations w/template template parameters
 template <template <typename> class T> class TTP1;
@@ -41,10 +43,10 @@ template <int> class NTP0;
 template <int N> class NTP1;
 template <int N = 5> class NTP2;
 template <int = 10> class NTP3;
-template <unsigned int N = 12u> NTP4;;
-template <unsigned int = 12u> NTP5;
-template <unsigned = 15u> NTP6;
-template <typename T, T Obj> NTP7;
+template <unsigned int N = 12u> class NTP4; 
+template <unsigned int = 12u> class NTP5;
+template <unsigned = 15u> class NTP6;
+template <typename T, T Obj> class NTP7;
 
 // Template class declarations
 template <typename T> struct A { };
diff --git a/test/SemaCXX/implicit-int.cpp b/test/SemaCXX/implicit-int.cpp
new file mode 100644
index 0000000000..f771810e6f
--- /dev/null
+++ b/test/SemaCXX/implicit-int.cpp
@@ -0,0 +1,5 @@
+// RUN: clang -fsyntax-only -verify %s
+
+x; // expected-error{{C++ requires a type specifier for all declarations}}
+
+f(int y) { return y; } // expected-error{{C++ requires a type specifier for all declarations}}