From patchwork Mon Jun 7 02:32:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Honermann X-Patchwork-Id: 1488377 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=y253+QOK; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FyyBj0cHsz9sPf for ; Mon, 7 Jun 2021 12:34:53 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AFD403860C3F for ; Mon, 7 Jun 2021 02:34:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AFD403860C3F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1623033290; bh=qeSqFU4JnOEFCQQ9a6M+LGzjB0zQuZdoN4+m+fv6QA8=; h=Subject:To:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=y253+QOKFBEjdelhjzueTvMhZdbgi3IgwWkC9f2RsUmKWcX+0bZRa96usuFhJ7g5e SBg9jQX2Atwh2IXehxZIk+BQRvEL41KeI2za62HTf5Dqv7s+LOqZEi5I9zOLidn/5M AcxS5S0yntBWG6pwUKo9nANZCuEQNpOl7bMLnhVY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp73.ord1d.emailsrvr.com (smtp73.ord1d.emailsrvr.com [184.106.54.73]) by sourceware.org (Postfix) with ESMTPS id 3824D38515D5 for ; Mon, 7 Jun 2021 02:32:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3824D38515D5 X-Auth-ID: tom@honermann.net Received: by smtp18.relay.ord1d.emailsrvr.com (Authenticated sender: tom-AT-honermann.net) with ESMTPSA id 97DFFA006F for ; Sun, 6 Jun 2021 22:32:08 -0400 (EDT) Subject: =?utf-8?b?W1BBVENIIDIvM106IEMgTjI2NTMgY2hhcjhfdDogTmV3IHRlc3Rz4oCL?= To: gcc-patches Message-ID: Date: Sun, 6 Jun 2021 22:32:07 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 Content-Language: en-US X-Classification-ID: 605c5316-eb05-42c8-9ef3-d9e27027c33c-1-1 X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tom Honermann via Gcc-patches From: Tom Honermann Reply-To: Tom Honermann Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" This patch provides new tests for the core language and compiler dependent library changes proposed in WG14 N2653 [1] for C. Most of the tests are provided in both a positive (-fchar8_t) and negative (-fno-char8_t) form to ensure behaviors are appropriately present or absent in each mode. Tested on Linux x86_64. gcc/testsuite/ChangeLog: 2021-05-31 Tom Honermann * gcc.dg/atomic/stdatomic-lockfree-char8_t.c: New test. * gcc.dg/char8_t-init-string-literal-1.c: New test. * gcc.dg/char8_t-predefined-macros-1.c: New test. * gcc.dg/char8_t-predefined-macros-2.c: New test. * gcc.dg/char8_t-string-literal-1.c: New test. * gcc.dg/char8_t-string-literal-2.c: New test. Tom. [1]: WG14 N2653 "char8_t: A type for UTF-8 characters and strings (Revision 1)" http://www.open-std.org/jtc1/sc22/wg14/www/docs/n2653.htm commit 900aa3507defd80339828e5791c215a28efd9fea Author: Tom Honermann Date: Sat Feb 13 10:02:41 2021 -0500 N2653 char8_t for C: New tests This change provides new tests for the core language and compiler dependent library changes proposed in WG14 N2653 for C. Some of the tests are provided in both a positive (-fchar8_t) and negative (-fno-char8_t) form to ensure behaviors are appropriately present or absent in each mode. diff --git a/gcc/testsuite/gcc.dg/atomic/stdatomic-lockfree-char8_t.c b/gcc/testsuite/gcc.dg/atomic/stdatomic-lockfree-char8_t.c new file mode 100644 index 00000000000..bb9eae84e83 --- /dev/null +++ b/gcc/testsuite/gcc.dg/atomic/stdatomic-lockfree-char8_t.c @@ -0,0 +1,42 @@ +/* Test atomic_is_lock_free for char8_t. */ +/* { dg-do run } */ +/* { dg-options "-std=c11 -fchar8_t -pedantic-errors" } */ + +#include +#include + +extern void abort (void); + +_Atomic __CHAR8_TYPE__ ac8a; +atomic_char8_t ac8t; + +#define CHECK_TYPE(MACRO, V1, V2) \ + do \ + { \ + int r1 = MACRO; \ + int r2 = atomic_is_lock_free (&V1); \ + int r3 = atomic_is_lock_free (&V2); \ + if (r1 != 0 && r1 != 1 && r1 != 2) \ + abort (); \ + if (r2 != 0 && r2 != 1) \ + abort (); \ + if (r3 != 0 && r3 != 1) \ + abort (); \ + if (r1 == 2 && r2 != 1) \ + abort (); \ + if (r1 == 2 && r3 != 1) \ + abort (); \ + if (r1 == 0 && r2 != 0) \ + abort (); \ + if (r1 == 0 && r3 != 0) \ + abort (); \ + } \ + while (0) + +int +main () +{ + CHECK_TYPE (ATOMIC_CHAR8_T_LOCK_FREE, ac8a, ac8t); + + return 0; +} diff --git a/gcc/testsuite/gcc.dg/char8_t-init-string-literal-1.c b/gcc/testsuite/gcc.dg/char8_t-init-string-literal-1.c new file mode 100644 index 00000000000..4d587e90a26 --- /dev/null +++ b/gcc/testsuite/gcc.dg/char8_t-init-string-literal-1.c @@ -0,0 +1,13 @@ +/* Test that char, signed char, and unsigned char arrays can still be + initialized by UTF-8 string literals if -fchar8_t is enabled. */ +/* { dg-do compile } */ +/* { dg-options "-fchar8_t" } */ + +char cbuf1[] = u8"text"; +char cbuf2[] = { u8"text" }; + +signed char scbuf1[] = u8"text"; +signed char scbuf2[] = { u8"text" }; + +unsigned char ucbuf1[] = u8"text"; +unsigned char ucbuf2[] = { u8"text" }; diff --git a/gcc/testsuite/gcc.dg/char8_t-predefined-macros-1.c b/gcc/testsuite/gcc.dg/char8_t-predefined-macros-1.c new file mode 100644 index 00000000000..884c634990d --- /dev/null +++ b/gcc/testsuite/gcc.dg/char8_t-predefined-macros-1.c @@ -0,0 +1,16 @@ +// Test that char8_t related predefined macros are not present when -fchar8_t is +// not enabled. +// { dg-do compile } +// { dg-options "-fno-char8_t" } + +#if defined(_CHAR8_T_SOURCE) +# error _CHAR8_T_SOURCE is defined! +#endif + +#if defined(__CHAR8_TYPE__) +# error __CHAR8_TYPE__ is defined! +#endif + +#if defined(__GCC_ATOMIC_CHAR8_T_LOCK_FREE) +# error __GCC_ATOMIC_CHAR8_T_LOCK_FREE is defined! +#endif diff --git a/gcc/testsuite/gcc.dg/char8_t-predefined-macros-2.c b/gcc/testsuite/gcc.dg/char8_t-predefined-macros-2.c new file mode 100644 index 00000000000..7f425357f57 --- /dev/null +++ b/gcc/testsuite/gcc.dg/char8_t-predefined-macros-2.c @@ -0,0 +1,16 @@ +// Test that char8_t related predefined macros are present when -fchar8_t is +// enabled. +// { dg-do compile } +// { dg-options "-fchar8_t" } + +#if !defined(_CHAR8_T_SOURCE) +# error _CHAR8_T_SOURCE is not defined! +#endif + +#if !defined(__CHAR8_TYPE__) +# error __CHAR8_TYPE__ is not defined! +#endif + +#if !defined(__GCC_ATOMIC_CHAR8_T_LOCK_FREE) +# error __GCC_ATOMIC_CHAR8_T_LOCK_FREE is not defined! +#endif diff --git a/gcc/testsuite/gcc.dg/char8_t-string-literal-1.c b/gcc/testsuite/gcc.dg/char8_t-string-literal-1.c new file mode 100644 index 00000000000..df94582ac1d --- /dev/null +++ b/gcc/testsuite/gcc.dg/char8_t-string-literal-1.c @@ -0,0 +1,6 @@ +// Test that UTF-8 string literals have type char[] if -fchar8_t is not enabled. +// { dg-do compile } +// { dg-options "-std=c11 -fno-char8_t" } + +_Static_assert (_Generic (u8"text", char*: 1, unsigned char*: 2) == 1, "UTF-8 string literals have an unexpected type"); +_Static_assert (_Generic (u8"x"[0], char: 1, unsigned char: 2) == 1, "UTF-8 string literal elements have an unexpected type"); diff --git a/gcc/testsuite/gcc.dg/char8_t-string-literal-2.c b/gcc/testsuite/gcc.dg/char8_t-string-literal-2.c new file mode 100644 index 00000000000..e7fd21f1067 --- /dev/null +++ b/gcc/testsuite/gcc.dg/char8_t-string-literal-2.c @@ -0,0 +1,6 @@ +// Test that UTF-8 string literals have type unsigned char[] if -fchar8_t is enabled. +// { dg-do compile } +// { dg-options "-std=c11 -fchar8_t" } + +_Static_assert (_Generic (u8"text", char*: 1, unsigned char*: 2) == 2, "UTF-8 string literals have an unexpected type"); +_Static_assert (_Generic (u8"x"[0], char: 1, unsigned char: 2) == 2, "UTF-8 string literal elements have an unexpected type");