diff options
| -rw-r--r-- | include/clang/Basic/DiagnosticCommonKinds.td | 3 | ||||
| -rw-r--r-- | include/clang/Basic/DiagnosticGroups.td | 9 | ||||
| -rw-r--r-- | lib/Parse/ParseTemplate.cpp | 12 | ||||
| -rw-r--r-- | lib/Sema/SemaType.cpp | 7 | ||||
| -rw-r--r-- | test/SemaCXX/cxx98-compat.cpp | 10 |
5 files changed, 35 insertions, 6 deletions
diff --git a/include/clang/Basic/DiagnosticCommonKinds.td b/include/clang/Basic/DiagnosticCommonKinds.td index 2f32a590e0..ef114eb7bd 100644 --- a/include/clang/Basic/DiagnosticCommonKinds.td +++ b/include/clang/Basic/DiagnosticCommonKinds.td @@ -53,6 +53,9 @@ def err_invalid_storage_class_in_func_decl : Error< def err_expected_namespace_name : Error<"expected namespace name">; def ext_variadic_templates : ExtWarn< "variadic templates are a C++11 extension">, InGroup<CXX0x>; +def warn_cxx98_compat_variadic_templates : + Warning<"variadic templates are incompatible with C++98">, + InGroup<CXX98CompatVariadicTemplates>, DefaultIgnore; def err_default_special_members : Error< "only special member functions may be defaulted">; def err_friends_define_only_namespace_scope : Error< diff --git a/include/clang/Basic/DiagnosticGroups.td b/include/clang/Basic/DiagnosticGroups.td index 55e8831281..3e1b7085db 100644 --- a/include/clang/Basic/DiagnosticGroups.td +++ b/include/clang/Basic/DiagnosticGroups.td @@ -57,6 +57,15 @@ def FormatZeroLength : DiagGroup<"format-zero-length">; def CXX0xNarrowing : DiagGroup<"c++0x-narrowing">; def CXX0xCompat : DiagGroup<"c++0x-compat", [CXX0xNarrowing]>; + +// These groups warn in C++0x mode about non-C++98 constructs, and +// constructs with different behavior between the two versions of the +// language. Each particular warning should be in a specific group as +// well as the general -Wc++98-compat group. +// FIXME: This is highly incomplete. +def CXX98CompatVariadicTemplates : DiagGroup<"c++98-compat-variadic-templates">; +def CXX98Compat : DiagGroup<"c++98-compat", [CXX98CompatVariadicTemplates]>; + def : DiagGroup<"effc++">; def ExitTimeDestructors : DiagGroup<"exit-time-destructors">; def FourByteMultiChar : DiagGroup<"four-char-constants">; diff --git a/lib/Parse/ParseTemplate.cpp b/lib/Parse/ParseTemplate.cpp index 92fe4a5f33..3d68a4ab9d 100644 --- a/lib/Parse/ParseTemplate.cpp +++ b/lib/Parse/ParseTemplate.cpp @@ -475,8 +475,10 @@ Decl *Parser::ParseTypeParameter(unsigned Depth, unsigned Position) { Ellipsis = true; EllipsisLoc = ConsumeToken(); - if (!getLang().CPlusPlus0x) - Diag(EllipsisLoc, diag::ext_variadic_templates); + Diag(EllipsisLoc, + getLang().CPlusPlus0x + ? diag::warn_cxx98_compat_variadic_templates + : diag::ext_variadic_templates); } // Grab the template parameter name (if given) @@ -547,8 +549,10 @@ Parser::ParseTemplateTemplateParameter(unsigned Depth, unsigned Position) { if (Tok.is(tok::ellipsis)) { EllipsisLoc = ConsumeToken(); - if (!getLang().CPlusPlus0x) - Diag(EllipsisLoc, diag::ext_variadic_templates); + Diag(EllipsisLoc, + getLang().CPlusPlus0x + ? diag::warn_cxx98_compat_variadic_templates + : diag::ext_variadic_templates); } // Get the identifier, if given. diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp index cee4ed67a1..dc08320cad 100644 --- a/lib/Sema/SemaType.cpp +++ b/lib/Sema/SemaType.cpp @@ -2488,8 +2488,11 @@ static TypeSourceInfo *GetFullTypeForDeclarator(TypeProcessingState &state, // it expands those parameter packs. if (T->containsUnexpandedParameterPack()) T = Context.getPackExpansionType(T, llvm::Optional<unsigned>()); - else if (!LangOpts.CPlusPlus0x) - S.Diag(D.getEllipsisLoc(), diag::ext_variadic_templates); + else + S.Diag(D.getEllipsisLoc(), + LangOpts.CPlusPlus0x + ? diag::warn_cxx98_compat_variadic_templates + : diag::ext_variadic_templates); break; case Declarator::FileContext: diff --git a/test/SemaCXX/cxx98-compat.cpp b/test/SemaCXX/cxx98-compat.cpp new file mode 100644 index 0000000000..37815d4797 --- /dev/null +++ b/test/SemaCXX/cxx98-compat.cpp @@ -0,0 +1,10 @@ +// RUN: %clang_cc1 -fsyntax-only -std=c++0x -Wc++98-compat -verify %s + +template<typename ...T> // expected-warning {{variadic templates are incompatible with C++98}} +class Variadic1 {}; + +template<template<typename> class ...T> // expected-warning {{variadic templates are incompatible with C++98}} +class Variadic2 {}; + +template<int ...I> // expected-warning {{variadic templates are incompatible with C++98}} +class Variadic3 {}; |