diff options
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticGroups.td | 5 | ||||
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticParseKinds.td | 2 | ||||
| -rw-r--r-- | clang/test/Parser/cxx-extra-semi.cpp | 3 | ||||
| -rw-r--r-- | clang/test/SemaCXX/extra-semi.cpp | 29 |
4 files changed, 37 insertions, 2 deletions
diff --git a/clang/include/clang/Basic/DiagnosticGroups.td b/clang/include/clang/Basic/DiagnosticGroups.td index 2d471f1fa5a..c6f98cbade4 100644 --- a/clang/include/clang/Basic/DiagnosticGroups.td +++ b/clang/include/clang/Basic/DiagnosticGroups.td @@ -151,8 +151,10 @@ def Exceptions : DiagGroup<"exceptions">; def GNUEmptyInitializer : DiagGroup<"gnu-empty-initializer">; def GNUEmptyStruct : DiagGroup<"gnu-empty-struct">; def ExtraTokens : DiagGroup<"extra-tokens">; +def CXX98CompatExtraSemi : DiagGroup<"c++98-compat-extra-semi">; def CXX11ExtraSemi : DiagGroup<"c++11-extra-semi">; -def ExtraSemi : DiagGroup<"extra-semi", [CXX11ExtraSemi]>; +def ExtraSemi : DiagGroup<"extra-semi", [CXX98CompatExtraSemi, + CXX11ExtraSemi]>; def GNUFlexibleArrayInitializer : DiagGroup<"gnu-flexible-array-initializer">; def GNUFlexibleArrayUnionMember : DiagGroup<"gnu-flexible-array-union-member">; @@ -196,6 +198,7 @@ def CXX98Compat : DiagGroup<"c++98-compat", def CXX98CompatPedantic : DiagGroup<"c++98-compat-pedantic", [CXX98Compat, CXX98CompatBindToTemporaryCopy, + CXX98CompatExtraSemi, CXXPre14CompatPedantic, CXXPre17CompatPedantic, CXXPre2aCompatPedantic]>; diff --git a/clang/include/clang/Basic/DiagnosticParseKinds.td b/clang/include/clang/Basic/DiagnosticParseKinds.td index e60f3ae64b2..40c84d4afdd 100644 --- a/clang/include/clang/Basic/DiagnosticParseKinds.td +++ b/clang/include/clang/Basic/DiagnosticParseKinds.td @@ -39,7 +39,7 @@ def ext_empty_translation_unit : Extension< InGroup<DiagGroup<"empty-translation-unit">>; def warn_cxx98_compat_top_level_semi : Warning< "extra ';' outside of a function is incompatible with C++98">, - InGroup<CXX98CompatPedantic>, DefaultIgnore; + InGroup<CXX98CompatExtraSemi>, DefaultIgnore; def ext_extra_semi : Extension< "extra ';' %select{" "outside of a function|" diff --git a/clang/test/Parser/cxx-extra-semi.cpp b/clang/test/Parser/cxx-extra-semi.cpp index 2aa18dfcc0e..de14bc0354d 100644 --- a/clang/test/Parser/cxx-extra-semi.cpp +++ b/clang/test/Parser/cxx-extra-semi.cpp @@ -38,4 +38,7 @@ union B { #if __cplusplus < 201103L // expected-warning@-3{{extra ';' outside of a function is a C++11 extension}} // expected-warning@-3{{extra ';' outside of a function is a C++11 extension}} +#elif !defined(PEDANTIC) +// expected-warning@-6{{extra ';' outside of a function is incompatible with C++98}} +// expected-warning@-6{{extra ';' outside of a function is incompatible with C++98}} #endif diff --git a/clang/test/SemaCXX/extra-semi.cpp b/clang/test/SemaCXX/extra-semi.cpp new file mode 100644 index 00000000000..be7435a4068 --- /dev/null +++ b/clang/test/SemaCXX/extra-semi.cpp @@ -0,0 +1,29 @@ +// RUN: %clang_cc1 -verify -std=c++98 -Wextra-semi %s +// RUN: %clang_cc1 -verify -std=c++03 -Wextra-semi %s +// RUN: %clang_cc1 -verify -std=c++11 -Wextra-semi %s +// RUN: %clang_cc1 -verify -std=c++17 -Wextra-semi %s +// RUN: %clang_cc1 -verify -std=c++2a -Wextra-semi %s +// RUN: %clang_cc1 -verify -Weverything -Wno-c++98-compat %s +// RUN: %clang_cc1 -verify -Weverything -Wno-c++98-compat-pedantic -Wc++98-compat-extra-semi %s + +// Last RUN line checks that c++98-compat-extra-semi can still be re-enabled. + +void F(); + +void F(){} +; +#if __cplusplus < 201103L +// expected-warning@-2{{extra ';' outside of a function is a C++11 extension}} +#else +// expected-warning@-4{{extra ';' outside of a function is incompatible with C++98}} +#endif + +namespace ns { +class C { + void F() const; +}; +} +; // expected-warning {{extra ';' outside of a function is}} + +void ns::C::F() const {} +; // expected-warning {{extra ';' outside of a function is}} |
