K&R-style functions not allowed in C++.

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

diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp
index 84a13814433749429c2170901c5039e02b0ae02c..51223a7ccfe290d205f4604d02aa9bbf06d38b2e 100644 (file)
--- a/lib/Parse/Parser.cpp
+++ b/lib/Parse/Parser.cpp
@@ -420,8 +420,9 @@ Parser::DeclTy *Parser::ParseDeclarationOrFunctionDefinition() {
       Tok.is(tok::kw___attribute)) {  // int X() __attr__ -> not a function def
     // FALL THROUGH.
   } else if (DeclaratorInfo.isFunctionDeclarator() &&
-             (Tok.is(tok::l_brace) ||           // int X() {}
-              isDeclarationSpecifier())) {      // int X(f) int f; {}
+             (Tok.is(tok::l_brace) ||             // int X() {}
+              ( !getLang().CPlusPlus &&
+                isDeclarationSpecifier() ))) {    // int X(f) int f; {}
     if (DS.getStorageClassSpec() == DeclSpec::SCS_typedef) {
       Diag(Tok, diag::err_function_declared_typedef);