From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2140) id 408F43858D33; Fri, 3 Mar 2023 05:36:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 408F43858D33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677821782; bh=YqDaFLQsJ/rkLPB3tr8b8alLNpzz1wKCWz0Evs8202k=; h=From:To:Subject:Date:From; b=OdBai/mrWKskNnsQYLlfd/F4y0evQFmrtMc6C1Y8ZeO4zy4BERFfMe/9t4m+LGsBi EkY2b1Chs2yLfd9w/C/N8LB20cItsQUdox9clA9B4UPiVQzV2i/MmuHdiXOr3oaslf kCKDSwi4aCBX3zM5wBcoZi4jbYYzktEyCqTXKATk= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Alexandre Oliva To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-6436] [vxworks] make wint_t and wchar_t the same distinct type X-Act-Checkin: gcc X-Git-Author: Alexandre Oliva X-Git-Refname: refs/heads/master X-Git-Oldrev: 2e8686cb51896e0f89b353ae599c2c1ac5b960d6 X-Git-Newrev: ddf7411e2069c33f56541eab35c37558199f3c41 Message-Id: <20230303053622.408F43858D33@sourceware.org> Date: Fri, 3 Mar 2023 05:36:22 +0000 (GMT) List-Id: https://gcc.gnu.org/g:ddf7411e2069c33f56541eab35c37558199f3c41 commit r13-6436-gddf7411e2069c33f56541eab35c37558199f3c41 Author: Alexandre Oliva Date: Fri Mar 3 01:47:04 2023 -0300 [vxworks] make wint_t and wchar_t the same distinct type 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. 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. Diff: --- 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 05468219e81..bfb950e56db 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 b333f97fd32..98f5aef2af9 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 83580d0dec2..9733c90fe4c 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 ------------------ */