From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rock.gnat.com (rock.gnat.com [IPv6:2620:20:4000:0:a9e:1ff:fe9b:1d1]) by sourceware.org (Postfix) with ESMTPS id 8250F3858D33 for ; Fri, 17 Feb 2023 07:05:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8250F3858D33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 5624B116B60; Fri, 17 Feb 2023 02:05:06 -0500 (EST) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id m0tQ6jJKFgW3; Fri, 17 Feb 2023 02:05:06 -0500 (EST) Received: from free.home (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPS id 89180116936; Fri, 17 Feb 2023 02:05:05 -0500 (EST) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 31H74nO4090795 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Fri, 17 Feb 2023 04:04:49 -0300 From: Alexandre Oliva To: gcc-patches@gcc.gnu.org Cc: hainque@adacore.com, joseph@codesourcery.com, jason@redhat.com, nathan@acm.org Subject: [PATCH] [vxworks] make wint_t and wchar_t the same distinct type Organization: Free thinker, does not speak for AdaCore Errors-To: aoliva@lxoliva.fsfla.org Date: Fri, 17 Feb 2023 04:04:49 -0300 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 2.84 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_STATUS,SPF_HELO_NONE,SPF_PASS,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: We used to define WINT_TYPE to WCHAR_TYPE, so that both wint_t and wchar_t mapped to the same underlying type, but this caused a glitch in Wstringop-overflow-6.C: on vxworks, wint_t is typedef'ed to wchar_t, headers got included in the test that declared functions that take wint_t parameters, and those conflicted with the builtin declarations that had wint_t mapped to the underlying integral type. The problem is that, in C++, wchar_t is a distinct type. Having wint_t be a typedef to wchar_t in the headers, but a typedef to wchar_t's underlying integral type in builtins, makes for mismatches between the declarations. This patch defines WINT_TYPE to "wchar_t" for vxworks, and adjusts the fallout, namely: - since wchar_t may not have been defined yet when c_common_nodes_and_builtins runs, use the node already reserved for wchar_t for wint_t when WINT_TYPE is defined to wchar_t. - for the same reason, when WINT_TYPE is wchar_t and we're not compiling C++ where wchar_t is a compiler built-in, define __WINT_TYPE__ to WCHAR_TYPE rather than WINT_TYPE, because wchar_t may not even be defined in the translation unit. - recognize and handle wchar_type_node when type_suffix is called for wint_type_node. Regstrapped on x86_64-linux-gnu. Tested on arm-vxworks7 (gcc-12) and arm-eabi (trunk). Ok to install? for gcc/ChangeLog * config/vx-common.h (WINT_TYPE): Alias to "wchar_t". for gcc/c-family/ChangeLog * c-common.cc (c_common_nodes_and_builtins): Take wchar_type_node for wint_type_node when aliased. (c_stddef_cpp_builtins): Define __WINT_TYPE__, when aliased to wchar_t, to the underlying type rather than wchar_t in non-C++. * c-cppbuiltin.cc (type_suffix): Handle wchar_type_node. --- gcc/c-family/c-common.cc | 16 +++++++++++++--- gcc/c-family/c-cppbuiltin.cc | 2 ++ gcc/config/vx-common.h | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/gcc/c-family/c-common.cc b/gcc/c-family/c-common.cc index ae92cd5adaf5e..a92597c2f544f 100644 --- a/gcc/c-family/c-common.cc +++ b/gcc/c-family/c-common.cc @@ -4576,8 +4576,11 @@ c_common_nodes_and_builtins (void) char32_array_type_node = build_array_type (char32_type_node, array_domain_type); - wint_type_node = - TREE_TYPE (identifier_global_value (get_identifier (WINT_TYPE))); + if (strcmp (WINT_TYPE, "wchar_t") == 0) + wint_type_node = wchar_type_node; + else + wint_type_node = + TREE_TYPE (identifier_global_value (get_identifier (WINT_TYPE))); intmax_type_node = TREE_TYPE (identifier_global_value (get_identifier (INTMAX_TYPE))); @@ -5359,7 +5362,14 @@ c_stddef_cpp_builtins(void) builtin_define_with_value ("__SIZE_TYPE__", SIZE_TYPE, 0); builtin_define_with_value ("__PTRDIFF_TYPE__", PTRDIFF_TYPE, 0); builtin_define_with_value ("__WCHAR_TYPE__", MODIFIED_WCHAR_TYPE, 0); - builtin_define_with_value ("__WINT_TYPE__", WINT_TYPE, 0); + /* C++ has wchar_t as a builtin type, C doesn't, so if WINT_TYPE + maps to wchar_t, define it to the underlying WCHAR_TYPE in C, and + to wchar_t in C++, so the desired type equivalence holds. */ + if (!c_dialect_cxx () + && strcmp (WINT_TYPE, "wchar_t") == 0) + builtin_define_with_value ("__WINT_TYPE__", WCHAR_TYPE, 0); + else + builtin_define_with_value ("__WINT_TYPE__", WINT_TYPE, 0); builtin_define_with_value ("__INTMAX_TYPE__", INTMAX_TYPE, 0); builtin_define_with_value ("__UINTMAX_TYPE__", UINTMAX_TYPE, 0); if (flag_char8_t) diff --git a/gcc/c-family/c-cppbuiltin.cc b/gcc/c-family/c-cppbuiltin.cc index b333f97fd3237..98f5aef2af95d 100644 --- a/gcc/c-family/c-cppbuiltin.cc +++ b/gcc/c-family/c-cppbuiltin.cc @@ -1903,6 +1903,8 @@ type_suffix (tree type) systems use it anyway. */ || type == char_type_node) is_long = 0; + else if (type == wchar_type_node) + return type_suffix (underlying_wchar_type_node); else gcc_unreachable (); diff --git a/gcc/config/vx-common.h b/gcc/config/vx-common.h index 83580d0dec288..9733c90fe4c6f 100644 --- a/gcc/config/vx-common.h +++ b/gcc/config/vx-common.h @@ -69,7 +69,7 @@ along with GCC; see the file COPYING3. If not see #undef WINT_TYPE_SIZE #define WINT_TYPE_SIZE WCHAR_TYPE_SIZE #undef WINT_TYPE -#define WINT_TYPE WCHAR_TYPE +#define WINT_TYPE "wchar_t" /* ---------------------- Debug and unwind info formats ------------------ */ -- Alexandre Oliva, happy hacker https://FSFLA.org/blogs/lxo/ Free Software Activist GNU Toolchain Engineer Disinformation flourishes because many people care deeply about injustice but very few check the facts. Ask me about