From 7abcc9ca20d4e17deabb308b5f483aaccc3dc02c Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 30 Nov 2021 09:50:52 +0100 Subject: [PATCH] libcpp: Enable P1949R7 for C++11 and up as it was a DR [PR100977] Jonathan mentioned on IRC that: "Accept P1949R7 (C++ Identifier Syntax using Unicode Standard Annex 31) as a Defect Report and apply the changes therein to the C++ working paper." while I've actually implemented it only for -std={gnu,c}++{23,2b}. As the C++98 rules were significantly different, I'm not trying to change anything for C++98. 2021-11-30 Jakub Jelinek PR c++/100977 * init.c (lang_defaults): Enable cxx23_identifiers for -std={gnu,c}++{11,14,17,20} too. * c-c++-common/cpp/ucnid-2011-1-utf8.c: Expect errors in C++. * c-c++-common/cpp/ucnid-2011-1.c: Likewise. * g++.dg/cpp/ucnid-4-utf8.C: Add missing space to dg-options. * g++.dg/cpp23/normalize3.C: Enable for c++11 rather than just c++23. * g++.dg/cpp23/normalize4.C: Likewise. * g++.dg/cpp23/normalize5.C: Likewise. * g++.dg/cpp23/normalize7.C: Expect errors rather than just warnings for c++11 and up rather than just c++23. * g++.dg/cpp23/ucnid-2-utf8.C: Expect errors even for c++11 .. c++20. --- .../c-c++-common/cpp/ucnid-2011-1-utf8.c | 6 +++--- gcc/testsuite/c-c++-common/cpp/ucnid-2011-1.c | 6 +++--- gcc/testsuite/g++.dg/cpp/ucnid-4-utf8.C | 2 +- gcc/testsuite/g++.dg/cpp23/normalize3.C | 2 +- gcc/testsuite/g++.dg/cpp23/normalize4.C | 2 +- gcc/testsuite/g++.dg/cpp23/normalize5.C | 2 +- gcc/testsuite/g++.dg/cpp23/normalize7.C | 6 ++---- gcc/testsuite/g++.dg/cpp23/ucnid-2-utf8.C | 14 +++++++------- libcpp/init.c | 16 ++++++++-------- 9 files changed, 27 insertions(+), 29 deletions(-) diff --git a/gcc/testsuite/c-c++-common/cpp/ucnid-2011-1-utf8.c b/gcc/testsuite/c-c++-common/cpp/ucnid-2011-1-utf8.c index 02c5fc08f845..970d53ecd55c 100644 --- a/gcc/testsuite/c-c++-common/cpp/ucnid-2011-1-utf8.c +++ b/gcc/testsuite/c-c++-common/cpp/ucnid-2011-1-utf8.c @@ -2,7 +2,7 @@ /* { dg-options "-std=c11 -pedantic" { target c } } */ /* { dg-options "-std=c++11 -pedantic" { target c++ } } */ -¨ +¨ /* { dg-error "is not valid in an identifier" "" { target c++ } } */ B̀ @@ -11,5 +11,5 @@ B̀ À /* { dg-warning "not in NFC" } */ 𐀀 -🿽 -󡈴 +🿽 /* { dg-error "is not valid in an identifier" "" { target c++ } } */ +󡈴 /* { dg-error "is not valid in an identifier" "" { target c++ } } */ diff --git a/gcc/testsuite/c-c++-common/cpp/ucnid-2011-1.c b/gcc/testsuite/c-c++-common/cpp/ucnid-2011-1.c index b7ebce8ea60b..6babb4069b7d 100644 --- a/gcc/testsuite/c-c++-common/cpp/ucnid-2011-1.c +++ b/gcc/testsuite/c-c++-common/cpp/ucnid-2011-1.c @@ -2,7 +2,7 @@ /* { dg-options "-std=c11 -pedantic" { target c } } */ /* { dg-options "-std=c++11 -pedantic" { target c++ } } */ -\u00A8 +\u00A8 /* { dg-error "is not valid in an identifier" "" { target c++ } } */ B\u0300 @@ -11,5 +11,5 @@ B\u0300 A\u0300 /* { dg-warning "not in NFC" } */ \U00010000 -\U0001FFFD -\U000E1234 +\U0001FFFD /* { dg-error "is not valid in an identifier" "" { target c++ } } */ +\U000E1234 /* { dg-error "is not valid in an identifier" "" { target c++ } } */ diff --git a/gcc/testsuite/g++.dg/cpp/ucnid-4-utf8.C b/gcc/testsuite/g++.dg/cpp/ucnid-4-utf8.C index de252e87165d..1e5e3fc99db6 100644 --- a/gcc/testsuite/g++.dg/cpp/ucnid-4-utf8.C +++ b/gcc/testsuite/g++.dg/cpp/ucnid-4-utf8.C @@ -1,5 +1,5 @@ /* { dg-do preprocess } */ -/* { dg-options "-std=gnu++98"} */ +/* { dg-options "-std=gnu++98" } */ ª « /* { dg-error "not valid in an identifier" } */ diff --git a/gcc/testsuite/g++.dg/cpp23/normalize3.C b/gcc/testsuite/g++.dg/cpp23/normalize3.C index bf4bb3a1e828..1733d3845542 100644 --- a/gcc/testsuite/g++.dg/cpp23/normalize3.C +++ b/gcc/testsuite/g++.dg/cpp23/normalize3.C @@ -1,4 +1,4 @@ -// { dg-do preprocess { target { c++23 } } } +// { dg-do preprocess { target { c++11 } } } // { dg-options "-pedantic-errors" } \u00AA diff --git a/gcc/testsuite/g++.dg/cpp23/normalize4.C b/gcc/testsuite/g++.dg/cpp23/normalize4.C index 9f83cd76e854..48e723103ca7 100644 --- a/gcc/testsuite/g++.dg/cpp23/normalize4.C +++ b/gcc/testsuite/g++.dg/cpp23/normalize4.C @@ -1,4 +1,4 @@ -// { dg-do preprocess { target { c++23 } } } +// { dg-do preprocess { target { c++11 } } } // { dg-options "" } \u00AA diff --git a/gcc/testsuite/g++.dg/cpp23/normalize5.C b/gcc/testsuite/g++.dg/cpp23/normalize5.C index afe339ab5fca..cbeb13480bb3 100644 --- a/gcc/testsuite/g++.dg/cpp23/normalize5.C +++ b/gcc/testsuite/g++.dg/cpp23/normalize5.C @@ -1,4 +1,4 @@ -// { dg-do preprocess { target { c++23 } } } +// { dg-do preprocess { target { c++11 } } } // { dg-options "-pedantic-errors" } \u00AA diff --git a/gcc/testsuite/g++.dg/cpp23/normalize7.C b/gcc/testsuite/g++.dg/cpp23/normalize7.C index f639d657b393..a1c0a2f413a0 100644 --- a/gcc/testsuite/g++.dg/cpp23/normalize7.C +++ b/gcc/testsuite/g++.dg/cpp23/normalize7.C @@ -3,10 +3,8 @@ // { dg-options "-pedantic-errors" } constexpr int À = 1; // U+00C0 -constexpr int À = 2; // U+0041 U+0300 { dg-warning "is not in NFC" "" { target { ! c++23 } } } -// { dg-error "is not in NFC" "" { target c++23 } .-1 } +constexpr int À = 2; // U+0041 U+0300 { dg-error "is not in NFC" } constexpr int gv1 = \u00c0; -constexpr int gv2 = A\u0300; // { dg-warning "is not in NFC" "" { target { ! c++23 } } } -// { dg-error "is not in NFC" "" { target c++23 } .-1 } +constexpr int gv2 = A\u0300; // { dg-error "is not in NFC" } static_assert(gv1 == 1, ""); static_assert(gv2 == 2, ""); diff --git a/gcc/testsuite/g++.dg/cpp23/ucnid-2-utf8.C b/gcc/testsuite/g++.dg/cpp23/ucnid-2-utf8.C index 6c8aa6a4d242..712785ccc202 100644 --- a/gcc/testsuite/g++.dg/cpp23/ucnid-2-utf8.C +++ b/gcc/testsuite/g++.dg/cpp23/ucnid-2-utf8.C @@ -2,17 +2,17 @@ // { dg-do compile } // { dg-options "-pedantic-errors" } -bool 👷 = true; // { dg-error "is not valid in an identifier" "" { target { c++98_only || c++23 } } } +bool 👷 = true; // { dg-error "is not valid in an identifier" } bool 👷‍♀ = false; // { dg-error "is not valid in an identifier" } int ⏰ = 0; // { dg-error "is not valid in an identifier" } -int 🕐 = 0; // { dg-error "is not valid in an identifier" "" { target { c++98_only || c++23 } } } +int 🕐 = 0; // { dg-error "is not valid in an identifier" } int ☠ = 0; // { dg-error "is not valid in an identifier" } -int 💀 = 0; // { dg-error "is not valid in an identifier" "" { target { c++98_only || c++23 } } } +int 💀 = 0; // { dg-error "is not valid in an identifier" } int ✋ = 0; // { dg-error "is not valid in an identifier" } -int 👊 = 0; // { dg-error "is not valid in an identifier" "" { target { c++98_only || c++23 } } } +int 👊 = 0; // { dg-error "is not valid in an identifier" } int ✈ = 0; // { dg-error "is not valid in an identifier" } -int 🚀 = 0; // { dg-error "is not valid in an identifier" "" { target { c++98_only || c++23 } } } +int 🚀 = 0; // { dg-error "is not valid in an identifier" } int ☹ = 0; // { dg-error "is not valid in an identifier" } -int 😀 = 0; // { dg-error "is not valid in an identifier" "" { target { c++98_only || c++23 } } } +int 😀 = 0; // { dg-error "is not valid in an identifier" } struct E {}; -class 💩 : public E {}; // { dg-error "is not valid in an identifier" "" { target { c++98_only || c++23 } } } +class 💩 : public E {}; // { dg-error "is not valid in an identifier" } diff --git a/libcpp/init.c b/libcpp/init.c index f9a8f5f088f3..78719abfe204 100644 --- a/libcpp/init.c +++ b/libcpp/init.c @@ -114,14 +114,14 @@ static const struct lang_flags lang_defaults[] = /* STDC2X */ { 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 1 }, /* GNUCXX */ { 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0 }, /* CXX98 */ { 0, 1, 0, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0 }, - /* GNUCXX11 */ { 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0 }, - /* CXX11 */ { 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0 }, - /* GNUCXX14 */ { 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0 }, - /* CXX14 */ { 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0 }, - /* GNUCXX17 */ { 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0 }, - /* CXX17 */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0 }, - /* GNUCXX20 */ { 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0 }, - /* CXX20 */ { 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0 }, + /* GNUCXX11 */ { 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0 }, + /* CXX11 */ { 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0 }, + /* GNUCXX14 */ { 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0 }, + /* CXX14 */ { 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0 }, + /* GNUCXX17 */ { 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0 }, + /* CXX17 */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0 }, + /* GNUCXX20 */ { 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0 }, + /* CXX20 */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0 }, /* GNUCXX23 */ { 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1 }, /* CXX23 */ { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1 }, /* ASM */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }