From patchwork Wed Jul 5 08:10:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 116001 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1707551vqx; Wed, 5 Jul 2023 01:11:23 -0700 (PDT) X-Google-Smtp-Source: APBJJlEl2xPg+3FqbSqan6SQqc0eaBn/as5IRREWyBwj1geRS1TBte7MMcti9/RfmH4bduORVbpq X-Received: by 2002:a17:906:2206:b0:993:a396:ac64 with SMTP id s6-20020a170906220600b00993a396ac64mr619222ejs.38.1688544683380; Wed, 05 Jul 2023 01:11:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688544683; cv=none; d=google.com; s=arc-20160816; b=nYxyJTcf1FMzWsaj5SZqYzsfnNRflP5XXvL+GKLOFRuEa3cNAGLcIC/iEgz6JA5apv hGKPBY/7ZeDvAZvlnitBhi/J7QOlUkdTQPjfRaBqzN9QDLKnTY1hQySkOISheF8yyeLL ROmP2nDIcA/4IZyiFe/I0kUxC+/61BoNnqzv5sFC+0BbwQLQpbPg/JdKiPMuq1jCvR4G kPrakXjXtGP+vgMnT57cY/ac3p6sayYNiN2Kc1iJhhedRK4Ov+tm8WVVuiL+G+TaMj4E hl/oyCFtZAYJHP88d38QPnY50JtNhVf/cVFnCLRpBUzjMuZo+zadNdYOV3h+bFQdNf+T IwvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version:message-id:date :user-agent:references:in-reply-to:subject:to:from:ironport-sdr :dmarc-filter:delivered-to; bh=bprU2ia1+biOn5m+8t3eiRoSn4icCk6J+kgKTbWw8xk=; fh=gk9A5O7Gbglvz1MjrRQ4hZ2i3c68kYkpOZJg1emXh+g=; b=WCnfsBrAbTTRPNBaFxDPy5HKM3LsXL6udfNxEGszOaSXEKOVXC5dxMzTuBTBZbHCTq 49/CFN9wUQWqZFf31ZjEAXNJv7V1dcCBuxxYx9JTPYdJDRYFHmmLq98Bhd+cear9fTsr fns2n5J6Vk0oKudpAUZuG0pS2E7cYmLY+KHn4+7XzLFbfQZy4zjqiTFedY44054TLMaf grZpTcqWQn2XuQnttU+T7o8BhCEjU9KalL9Xr3PjY5Lryph58FydPeqyhSaURkkux9kW CTYlKssxZFm+soFW+C1atK1l20cv/ohdN5gm/t/egzmNaiEusIbcyqeGye5OEvZOuTbO 87Cg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id hk6-20020a170906c9c600b009929280d0d7si9489159ejb.432.2023.07.05.01.11.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jul 2023 01:11:23 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DFAF3385773C for ; Wed, 5 Jul 2023 08:11:00 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com [68.232.141.98]) by sourceware.org (Postfix) with ESMTPS id 6A6A33857343 for ; Wed, 5 Jul 2023 08:10:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6A6A33857343 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="6.01,182,1684828800"; d="scan'208,223";a="12268168" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 05 Jul 2023 00:10:33 -0800 IronPort-SDR: VYn8wpsus/hMLBG1FWparUcYkcyloYUgd0S3eg7p9CoXfbHaJs8jBBQ31pZ+yTRoDPxI3dv/Ea tUsze/G6tT4luFexhiEwQCSjWgeFf6+ShtMSIVxJzIasrAPHRNL6teXRLbrejnuoO7gACWbKle E5mNm7z8swN4DFO6+jV6FyGfm63/Fr6PPQA2lIJkGlUKj91CCtCtX2IF15NMkh2zcblODv3n/5 YY4xiRlV7hAFj/VkCfudjzqsJ+1HL0rAepfX8WrqDz5FN6A3DE57hn1OKheApPTqjuSGHZ9XGq PT4= From: Thomas Schwinge To: Subject: GTY: Clean up obsolete 'bool needs_cast_p' field of 'gcc/gengtype.cc:struct walk_type_data' (was: [PATCH 3/3] remove gengtype support for param_is use_param, if_marked and splay tree allocators) In-Reply-To: <1416802296-15833-4-git-send-email-tsaunders@mozilla.com> References: <1416802296-15833-1-git-send-email-tsaunders@mozilla.com> <1416802296-15833-4-git-send-email-tsaunders@mozilla.com> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/28.2 (x86_64-pc-linux-gnu) Date: Wed, 5 Jul 2023 10:10:27 +0200 Message-ID: <875y6yvkwc.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-15.mgc.mentorg.com (139.181.222.15) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770567429895111190?= X-GMAIL-MSGID: =?utf-8?q?1770567429895111190?= Hi! On 2014-11-23T23:11:36-0500, tsaunders@mozilla.com wrote: > gcc/ > > * plugin.c, plugin.def, ggc.h, ggc-common.c, gengtype.h, gengtype.c, > gengtype-state.c, gengtype-parse.c, gentype-lex.l, gcc-plugin.h, > doc/plugins.texi, doc/gty.texi: Remove support for if_marked and > param_is. > --- a/gcc/gengtype.c > +++ b/gcc/gengtype.c > @@ -2861,39 +2733,6 @@ walk_type (type_p t, struct walk_type_data *d) > if (d->used_length) > length = NULL; > > -[...] > - d->needs_cast_p = (t->kind != TYPE_POINTER > - && (nt->kind == TYPE_POINTER > - || nt->kind == TYPE_STRING)); > -[...] OK to push the attached "GTY: Clean up obsolete 'bool needs_cast_p' field of 'gcc/gengtype.cc:struct walk_type_data'"? No change in the 'gengtype'-generated files in my test build. Grüße Thomas ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955 From 12cad7f5b3bfd8b01c90f9e7817fd2d837f2802b Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Tue, 4 Jul 2023 22:47:48 +0200 Subject: [PATCH] GTY: Clean up obsolete 'bool needs_cast_p' field of 'gcc/gengtype.cc:struct walk_type_data' Last use disappeared in 2014 with commit 63f5d5b818319129217e41bcb23db53f99ff11b0 (Subversion r218558) "remove gengtype support for param_is use_param, if_marked and splay tree allocators". gcc/ * gengtype.cc (struct walk_type_data): Remove 'needs_cast_p'. Adjust all users. --- gcc/gengtype.cc | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/gcc/gengtype.cc b/gcc/gengtype.cc index 04dbb0de8bd..54d3c8aaec3 100644 --- a/gcc/gengtype.cc +++ b/gcc/gengtype.cc @@ -2447,7 +2447,6 @@ struct walk_type_data int used_length; type_p orig_s; const char *reorder_fn; - bool needs_cast_p; bool fn_wants_lvalue; bool in_record_p; int loopcounter; @@ -2663,7 +2662,6 @@ walk_type (type_p t, struct walk_type_data *d) options_p oo; const struct nested_ptr_data *nested_ptr_d = NULL; - d->needs_cast_p = false; for (oo = d->opt; oo; oo = oo->next) if (strcmp (oo->name, "length") == 0 && oo->kind == OPTION_STRING) length = oo->info.string; @@ -3186,7 +3184,6 @@ static void write_types_process_field (type_p f, const struct walk_type_data *d) { const struct write_types_data *wtd; - const char *cast = d->needs_cast_p ? "(void *)" : ""; wtd = (const struct write_types_data *) d->cookie; switch (f->kind) @@ -3195,8 +3192,8 @@ write_types_process_field (type_p f, const struct walk_type_data *d) case TYPE_UNDEFINED: gcc_unreachable (); case TYPE_POINTER: - oprintf (d->of, "%*s%s (%s%s", d->indent, "", - wtd->subfield_marker_routine, cast, d->val); + oprintf (d->of, "%*s%s (%s", d->indent, "", + wtd->subfield_marker_routine, d->val); if (wtd->param_prefix) { if (f->u.p->kind == TYPE_SCALAR) @@ -3229,8 +3226,8 @@ write_types_process_field (type_p f, const struct walk_type_data *d) } oprintf (d->of, ");\n"); if (d->reorder_fn && wtd->reorder_note_routine) - oprintf (d->of, "%*s%s (%s%s, %s, %s);\n", d->indent, "", - wtd->reorder_note_routine, cast, d->val, + oprintf (d->of, "%*s%s (%s, %s, %s);\n", d->indent, "", + wtd->reorder_note_routine, d->val, d->prev_val[3], d->reorder_fn); break; @@ -3262,16 +3259,16 @@ write_types_process_field (type_p f, const struct walk_type_data *d) : nullptr); if (length_override) { - oprintf (d->of, "2 (%s%s, ", cast, d->val); + oprintf (d->of, "2 (%s, ", d->val); output_escaped_param (d, length_override, "string_length"); } else - oprintf (d->of, " (%s%s", cast, d->val); + oprintf (d->of, " (%s", d->val); oprintf (d->of, ");\n"); if (d->reorder_fn && wtd->reorder_note_routine) - oprintf (d->of, "%*s%s (%s%s, %s%s, %s);\n", d->indent, "", - wtd->reorder_note_routine, cast, d->val, cast, d->val, + oprintf (d->of, "%*s%s (%s, %s, %s);\n", d->indent, "", + wtd->reorder_note_routine, d->val, d->val, d->reorder_fn); } break; -- 2.34.1