Back out __decltype warning from r151377: we should either warn on all the GNU
__keywords or none of them.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@151401 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Basic/DiagnosticParseKinds.td b/include/clang/Basic/DiagnosticParseKinds.td
index b3f2067..95288ac 100644
--- a/include/clang/Basic/DiagnosticParseKinds.td
+++ b/include/clang/Basic/DiagnosticParseKinds.td
@@ -254,9 +254,6 @@
"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;
diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index 5468700..d798281 100644
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -653,8 +653,8 @@
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();
diff --git a/test/SemaCXX/decltype-98.cpp b/test/SemaCXX/decltype-98.cpp
index 44d5896..db52565 100644
--- a/test/SemaCXX/decltype-98.cpp
+++ b/test/SemaCXX/decltype-98.cpp
@@ -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;
