Back out __decltype warning from r151377: we should either warn on all the GNU

__keywords or none of them.

llvm-svn: 151401
This commit is contained in:
Richard Smith 2012-02-24 22:30:04 +00:00
parent 5f640e35e3
commit 324df5564e
3 changed files with 4 additions and 7 deletions

View File

@ -254,9 +254,6 @@ def err_missing_comma_before_ellipsis : Error<
"C requires a comma prior to the ellipsis in a variadic function type">;
def err_unexpected_typedef_ident : Error<
"unexpected type name %0: expected identifier">;
def ext_gnu_decltype : Extension<
"'__decltype' type specifier is a GNU extension">,
InGroup<GNU>, DefaultIgnore;
def warn_cxx98_compat_decltype : Warning<
"'decltype' type specifier is incompatible with C++98">,
InGroup<CXX98Compat>, DefaultIgnore;

View File

@ -653,8 +653,8 @@ SourceLocation Parser::ParseDecltypeSpecifier(DeclSpec &DS) {
return EndLoc;
}
} else {
Diag(Tok, Tok.getIdentifierInfo()->isStr("decltype")
? diag::warn_cxx98_compat_decltype : diag::ext_gnu_decltype);
if (Tok.getIdentifierInfo()->isStr("decltype"))
Diag(Tok, diag::warn_cxx98_compat_decltype);
ConsumeToken();

View File

@ -1,3 +1,3 @@
// RUN: %clang_cc1 -std=c++98 -fsyntax-only -verify %s -Wgnu
// RUN: %clang_cc1 -std=c++98 -fsyntax-only -verify %s
extern int x;
__decltype(1) x = 3; // expected-warning {{is a GNU extension}}
__decltype(1) x = 3;