From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id D1EAC3858C62 for ; Mon, 26 Sep 2022 17:18:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D1EAC3858C62 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664212704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XH06W7jMvtW6r1kZVNPiMxI3zJOKqSVc2IQi0f/gpMI=; b=B6uK4M1raBZpmvgTeZ/7DngrIb4cZscHKn4GKOVdOBelDkrE3p3mr+A2+skSPS01aG0KzE NEc4sA0VFO320elN/9fVVDzbi/8iccvzYR7KAMKAm6c9pTsHXt4kcLAJUDrj7e8cf5QT9/ jQkSjOg7FWK0yJG06P662CG1trFM2cE= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-142-L5565S13NxeY9XQROdy5Gg-1; Mon, 26 Sep 2022 13:18:23 -0400 X-MC-Unique: L5565S13NxeY9XQROdy5Gg-1 Received: by mail-qt1-f200.google.com with SMTP id g21-20020ac87d15000000b0035bb6f08778so5136930qtb.2 for ; Mon, 26 Sep 2022 10:18:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date; bh=XH06W7jMvtW6r1kZVNPiMxI3zJOKqSVc2IQi0f/gpMI=; b=RZAQxt9k9eL1JGxCS7M5CmNqIqjsQDhtkI7VboeZhY9w1tahq1X18ocyHXDt6oJ8pv g8RRk0ptu/ItZfhpurVyPqQB6lnIADA6Q8A7Q77kwAtZX+N97L2AwlysAytGqr81u53m 8hl6NGcBB7b3VoeRmxk/KboBCDluMldFlFC4r6SeTcqFQ1S7jHVWQy7avm1RI04px9D1 //vO3fQUftgLa/jIgJ/MPIENqDZVfr8JpNicvvHg1x+BkPQT/CjP+xJZRNscCrNARcIt HOeMa6f9inTZ3C9RYgSVergOy3g+UPpUmHY/C6MHnhmQsOpypKzQ8MU9YVm9NipUUzZT ER1A== X-Gm-Message-State: ACrzQf2i5vIucI+PvxnZHpHdc7bYOfKGWJSCnuXfhuLO1mcKpqRmNzy/ wzszUZZUCpZAYTa7Y0PkNZb/FOS/bJarNoFvbQe4xk6DdU95qk3pLk9Ik3ZaqvMcDYzbpDidnnl K7fV9oGHeIG3vBVw4uA== X-Received: by 2002:ac8:584a:0:b0:35c:bf11:9e42 with SMTP id h10-20020ac8584a000000b0035cbf119e42mr18637073qth.425.1664212702709; Mon, 26 Sep 2022 10:18:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4thZt7038F2mN2S6vGzEfu2Ij8OwI3lGzmDgWsu2bUVmvxlZmkHXz7HnG2D4hlI9TGuUMNhA== X-Received: by 2002:ac8:584a:0:b0:35c:bf11:9e42 with SMTP id h10-20020ac8584a000000b0035cbf119e42mr18637052qth.425.1664212702291; Mon, 26 Sep 2022 10:18:22 -0700 (PDT) Received: from [192.168.1.101] (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id a3-20020a05622a02c300b0035d430d4315sm1787261qtx.19.2022.09.26.10.18.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 26 Sep 2022 10:18:21 -0700 (PDT) Message-ID: Date: Mon, 26 Sep 2022 13:18:20 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.13.1 Subject: Re: [PATCH] c++: P2513R4, char8_t Compatibility and Portability Fix [PR106656] To: Marek Polacek , GCC Patches References: <20220924011611.433106-1-polacek@redhat.com> From: Jason Merrill In-Reply-To: <20220924011611.433106-1-polacek@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 9/23/22 21:16, Marek Polacek wrote: > P0482R6, which added char8_t, didn't allow > > const char arr[] = u8"howdy"; > > because it said "Declarations of arrays of char may currently be initialized > with UTF-8 string literals. Under this proposal, such initializations would > become ill-formed." This caused too many issues, so P2513R4 alleviates some > of those compatibility problems. In particular, "Arrays of char or unsigned > char may now be initialized with a UTF-8 string literal." This restriction > has been lifted for initialization only, not implicit conversions. Also, > my reading is that 'signed char' was excluded from the allowable conversions. > > This is supposed to be treated as a DR in C++20. > > Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? OK. > PR c++/106656 > > gcc/c-family/ChangeLog: > > * c-cppbuiltin.cc (c_cpp_builtins): Update value of __cpp_char8_t > for C++20. > > gcc/cp/ChangeLog: > > * typeck2.cc (array_string_literal_compatible_p): Allow > initializing arrays of char or unsigned char by a UTF-8 string literal. > > gcc/testsuite/ChangeLog: > > * g++.dg/cpp23/feat-cxx2b.C: Adjust. > * g++.dg/cpp2a/feat-cxx2a.C: Likewise. > * g++.dg/ext/char8_t-feature-test-macro-2.C: Likewise. > * g++.dg/ext/char8_t-init-2.C: Likewise. > * g++.dg/cpp2a/char8_t3.C: New test. > * g++.dg/cpp2a/char8_t4.C: New test. > --- > gcc/c-family/c-cppbuiltin.cc | 2 +- > gcc/cp/typeck2.cc | 9 +++++ > gcc/testsuite/g++.dg/cpp23/feat-cxx2b.C | 4 +- > gcc/testsuite/g++.dg/cpp2a/char8_t3.C | 37 +++++++++++++++++++ > gcc/testsuite/g++.dg/cpp2a/char8_t4.C | 17 +++++++++ > gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C | 4 +- > .../g++.dg/ext/char8_t-feature-test-macro-2.C | 4 +- > gcc/testsuite/g++.dg/ext/char8_t-init-2.C | 4 +- > 8 files changed, 72 insertions(+), 9 deletions(-) > create mode 100644 gcc/testsuite/g++.dg/cpp2a/char8_t3.C > create mode 100644 gcc/testsuite/g++.dg/cpp2a/char8_t4.C > > diff --git a/gcc/c-family/c-cppbuiltin.cc b/gcc/c-family/c-cppbuiltin.cc > index a1557eb23d5..b709f845c81 100644 > --- a/gcc/c-family/c-cppbuiltin.cc > +++ b/gcc/c-family/c-cppbuiltin.cc > @@ -1112,7 +1112,7 @@ c_cpp_builtins (cpp_reader *pfile) > if (flag_threadsafe_statics) > cpp_define (pfile, "__cpp_threadsafe_static_init=200806L"); > if (flag_char8_t) > - cpp_define (pfile, "__cpp_char8_t=201811L"); > + cpp_define (pfile, "__cpp_char8_t=202207L"); > #ifndef THREAD_MODEL_SPEC > /* Targets that define THREAD_MODEL_SPEC need to define > __STDCPP_THREADS__ in their config/XXX/XXX-c.c themselves. */ > diff --git a/gcc/cp/typeck2.cc b/gcc/cp/typeck2.cc > index 75fd0e2a9bf..739097a9734 100644 > --- a/gcc/cp/typeck2.cc > +++ b/gcc/cp/typeck2.cc > @@ -1118,6 +1118,15 @@ array_string_literal_compatible_p (tree type, tree init) > if (ordinary_char_type_p (to_char_type) > && ordinary_char_type_p (from_char_type)) > return true; > + > + /* P2513 (C++20/C++23): "an array of char or unsigned char may > + be initialized by a UTF-8 string literal, or by such a string > + literal enclosed in braces." */ > + if (from_char_type == char8_type_node > + && (to_char_type == char_type_node > + || to_char_type == unsigned_char_type_node)) > + return true; > + > return false; > } > > diff --git a/gcc/testsuite/g++.dg/cpp23/feat-cxx2b.C b/gcc/testsuite/g++.dg/cpp23/feat-cxx2b.C > index d3e40724085..0537e1d24b5 100644 > --- a/gcc/testsuite/g++.dg/cpp23/feat-cxx2b.C > +++ b/gcc/testsuite/g++.dg/cpp23/feat-cxx2b.C > @@ -504,8 +504,8 @@ > > #ifndef __cpp_char8_t > # error "__cpp_char8_t" > -#elif __cpp_char8_t != 201811 > -# error "__cpp_char8_t != 201811" > +#elif __cpp_char8_t != 202207 > +# error "__cpp_char8_t != 202207" > #endif > > #ifndef __cpp_designated_initializers > diff --git a/gcc/testsuite/g++.dg/cpp2a/char8_t3.C b/gcc/testsuite/g++.dg/cpp2a/char8_t3.C > new file mode 100644 > index 00000000000..071a718c4d0 > --- /dev/null > +++ b/gcc/testsuite/g++.dg/cpp2a/char8_t3.C > @@ -0,0 +1,37 @@ > +// PR c++/106656 - P2513 - char8_t Compatibility and Portability Fixes > +// { dg-do compile { target c++20 } } > + > +const char *p1 = u8""; // { dg-error "invalid conversion" } > +const unsigned char *p2 = u8""; // { dg-error "invalid conversion" } > +const signed char *p3 = u8""; // { dg-error "invalid conversion" } > +const char *p4 = { u8"" }; // { dg-error "invalid conversion" } > +const unsigned char *p5 = { u8"" }; // { dg-error "invalid conversion" } > +const signed char *p6 = { u8"" }; // { dg-error "invalid conversion" } > +const char *p7 = static_cast(u8""); // { dg-error "invalid" } > +const char a1[] = u8"text"; > +const unsigned char a2[] = u8""; > +const signed char a3[] = u8""; // { dg-error "cannot initialize array" } > +const char a4[] = { u8"text" }; > +const unsigned char a5[] = { u8"" }; > +const signed char a6[] = { u8"" }; // { dg-error "cannot initialize array" } > + > +const char * > +resource_id () > +{ > + static const char res_id[] = u8""; > + return res_id; > +} > + > +const char8_t x[] = "fail"; // { dg-error "cannot initialize array" } > + > +void fn (const char a[]); > +void > +g () > +{ > + fn (u8"z"); // { dg-error "invalid conversion" } > +} > + > +char c = u8'c'; > +unsigned char uc = u8'c'; > +signed char sc = u8'c'; > +char8_t c8 = 'c'; > diff --git a/gcc/testsuite/g++.dg/cpp2a/char8_t4.C b/gcc/testsuite/g++.dg/cpp2a/char8_t4.C > new file mode 100644 > index 00000000000..c18081b66fb > --- /dev/null > +++ b/gcc/testsuite/g++.dg/cpp2a/char8_t4.C > @@ -0,0 +1,17 @@ > +// PR c++/106656 - P2513 - char8_t Compatibility and Portability Fixes > +// { dg-do compile { target c++20 } } > +// [diff.cpp20.dcl] > + > +struct A { > + char8_t s[10]; > +}; > +struct B { > + char s[10]; > +}; > + > +void f(A); > +void f(B); > + > +int main() { > + f({u8""}); // { dg-error "ambiguous" } > +} > diff --git a/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C b/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C > index c65ea6bf48a..02f3a377fd0 100644 > --- a/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C > +++ b/gcc/testsuite/g++.dg/cpp2a/feat-cxx2a.C > @@ -504,8 +504,8 @@ > > #ifndef __cpp_char8_t > # error "__cpp_char8_t" > -#elif __cpp_char8_t != 201811 > -# error "__cpp_char8_t != 201811" > +#elif __cpp_char8_t != 202207 > +# error "__cpp_char8_t != 202207" > #endif > > #ifndef __cpp_designated_initializers > diff --git a/gcc/testsuite/g++.dg/ext/char8_t-feature-test-macro-2.C b/gcc/testsuite/g++.dg/ext/char8_t-feature-test-macro-2.C > index df1063f6aa1..2d0f9045acf 100644 > --- a/gcc/testsuite/g++.dg/ext/char8_t-feature-test-macro-2.C > +++ b/gcc/testsuite/g++.dg/ext/char8_t-feature-test-macro-2.C > @@ -5,6 +5,6 @@ > > #if !defined(__cpp_char8_t) > # error __cpp_char8_t is not defined! > -#elif __cpp_char8_t != 201811 > -# error __cpp_char8_t != 201811 > +#elif __cpp_char8_t != 202207 > +# error __cpp_char8_t != 202207 > #endif > diff --git a/gcc/testsuite/g++.dg/ext/char8_t-init-2.C b/gcc/testsuite/g++.dg/ext/char8_t-init-2.C > index c713bc12266..02a96ffe5a4 100644 > --- a/gcc/testsuite/g++.dg/ext/char8_t-init-2.C > +++ b/gcc/testsuite/g++.dg/ext/char8_t-init-2.C > @@ -21,7 +21,7 @@ const char8_t (&rca4)[2] = u8"x"; > const char8_t (&rca5)[2] = u"x"; // { dg-error "invalid initialization of reference of type .const char8_t ....... from expression of type .const char16_t ...." "char8_t" } > > char ca1[] = "x"; > -char ca2[] = u8"x"; // { dg-error "from a string literal with type array of .char8_t." "char8_t" } > +char ca2[] = u8"x"; > char8_t ca3[] = "x"; // { dg-error "from a string literal with type array of .char." "char8_t" } > char8_t ca4[] = u8"x"; > char8_t ca5[] = u"x"; // { dg-error "from a string literal with type array of .char16_t." "char8_t" } > @@ -30,4 +30,4 @@ signed char sca1[] = "x"; > signed char sca2[] = u8"x"; // { dg-error "from a string literal with type array of .char8_t." "char8_t" } > > unsigned char uca1[] = "x"; > -unsigned char uca2[] = u8"x"; // { dg-error "from a string literal with type array of .char8_t." "char8_t" } > +unsigned char uca2[] = u8"x"; > > base-commit: f5072839c46acd185f40a5692aca06fac4ed6a48