From patchwork Wed Jul 5 16:12:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 116236 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1976818vqx; Wed, 5 Jul 2023 09:13:08 -0700 (PDT) X-Google-Smtp-Source: APBJJlFzxGaVbiJ5xYn7VwAx0rkON1osZFfzfWt/szGEfXit3FUZLnL9CUbr/+4IBwfucskOhJea X-Received: by 2002:a17:906:350b:b0:987:5761:2868 with SMTP id r11-20020a170906350b00b0098757612868mr10998283eja.11.1688573587751; Wed, 05 Jul 2023 09:13:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688573587; cv=none; d=google.com; s=arc-20160816; b=0C05k+m76uY8fze/Q0R6mR4spPZU7nmXqno9PnZqZpvUnS/d6vqVgoClPU9GuW/RHr 39lUP5HuqT3FoA3hXYkspCLlATF32UhVKqhQYti+W+MLphHmbEqByhHwQRxFZYrkhMQ8 sw88bzzvUNQK+nnewpeVneSNalF6lg57sEB8LK8LmoCTFrWGoGI6UajksnXFUXHjX4hl 6NEod2GWWv3EAkxBnLkn82Ylpo2Vagh+pDcjeVcOnNijcmwHPghNh4jenyqp2iJcS7A6 4gWPgwuoi6t9TRZYnFUiJcF+mdCPrMtLF/CHzny6fqQkYL1FXrZAAY18sk560Jdq6ZqT vSBg== 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=sm9pqSvMAj64YVmLumexlhLbA4FQuorSD19lC0lfnco=; fh=gk9A5O7Gbglvz1MjrRQ4hZ2i3c68kYkpOZJg1emXh+g=; b=VBJ61qal7391wRoB2L3gAp8fRgHmFvBsyw7YSe1+AEuNWhXP/tLM8/A5ZbMPnDbMp2 Y9hqaGl1p3oE2arYSBcwwIpaMSSapiFmGprvEizKXpZXmjXKFK9UL3EzOPvZd3M/dPMd J0ZxBv2Tn/u8/RFk11qWHKup/dXnq2t/EVVyVh20DdmWx+FqgDAz1Dz1XVBlFBtoS2Em cMuaoQt0XTy02ml3g63nU0HZ8DE2ts5CkwXhz5MQ5qmpK+QUETF6HNoXNnEgfB+LFv1D 0NvX+nAEIYw8/q37OGcaMyq+txxAD6PTGQb4rqQ5bQ5xcZipBUiOZF8DJTsP92+Dj9Zv 8MwQ== 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 l26-20020a1709060e1a00b00988c051a9edsi6577708eji.651.2023.07.05.09.13.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jul 2023 09:13:07 -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 8AE5C3856DDF for ; Wed, 5 Jul 2023 16:13:02 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com [68.232.137.180]) by sourceware.org (Postfix) with ESMTPS id 338DC385703F for ; Wed, 5 Jul 2023 16:12:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 338DC385703F 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,183,1684828800"; d="scan'208,223";a="11004266" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa3.mentor.iphmx.com with ESMTP; 05 Jul 2023 08:12:36 -0800 IronPort-SDR: 2NaX/2mVobKb9ZwMqPnVhTbW+CTLDW+DC5Yoyt1xhk00YaX34odL5zvbYhWruhti/6o2mHBuRJ EQmQo3bYnYEaL/Qi6Y2ZoSwidgFQ7DXydWo5qgwyw+YLSyOVCmem3ghDu4HzGt9l5Fc+8cckmB cPsQovgDxJoAId40H76PT8BezRL10W50UQ3NpEHdVAOjGmYazatwYAW+eC4wlDh1UhJ0w4OO7S 6LoTAVDOxd+1aJzgahRPOLQRz843QLqyEa/Oyuuz9S2UPmJN0c5DHT8/+n6JkS5+orao2JiYqg sXo= From: Thomas Schwinge To: Subject: [v2] GTY: Clean up obsolete parametrized structs remnants (was: [PATCH 3/3] remove gengtype support for param_is use_param, if_marked and splay tree allocators) In-Reply-To: <873522vkmu.fsf@euler.schwinge.homeip.net> References: <1416802296-15833-1-git-send-email-tsaunders@mozilla.com> <1416802296-15833-4-git-send-email-tsaunders@mozilla.com> <873522vkmu.fsf@euler.schwinge.homeip.net> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/28.2 (x86_64-pc-linux-gnu) Date: Wed, 5 Jul 2023 18:12:30 +0200 Message-ID: <87h6qitk0h.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.9 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?1770567767150630621?= X-GMAIL-MSGID: =?utf-8?q?1770597738144430973?= Hi! On 2023-07-05T10:16:09+0200, I wrote: > 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.h >> +++ b/gcc/gengtype.h > >> @@ -153,11 +152,6 @@ enum typekind { >> TYPE_LANG_STRUCT, /* GCC front-end language specific structs. >> Various languages may have homonymous but >> different structs. */ >> - TYPE_PARAM_STRUCT, /* Type for parametrized structs, e.g. hash_t >> - hash-tables, ... See (param_is, use_param, >> - param1_is, param2_is,... use_param1, >> - use_param_2,... use_params) GTY >> - options. */ >> TYPE_USER_STRUCT /* User defined type. Walkers and markers for >> this type are assumed to be provided by the >> user. */ > > OK to push the attached > "GTY: Clean up obsolete parametrized structs remnants"? Updated per "GTY: Repair 'enum gty_token', 'token_names' desynchronization", OK to push the attached v2 "GTY: Clean up obsolete parametrized structs remnants"? 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 fed7429b8c19c4bed570d343169ba6a35ed088b0 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 parametrized structs remnants Support removed in 2014 with commit 63f5d5b818319129217e41bcb23db53f99ff11b0 (Subversion r218558) "remove gengtype support for param_is use_param, if_marked and splay tree allocators". gcc/ * gengtype-parse.cc: Clean up obsolete parametrized structs remnants. * gengtype.cc: Likewise. * gengtype.h: Likewise. --- gcc/gengtype-parse.cc | 2 -- gcc/gengtype.cc | 6 ++---- gcc/gengtype.h | 3 +-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/gcc/gengtype-parse.cc b/gcc/gengtype-parse.cc index 8791b35a3da..6b6331cc228 100644 --- a/gcc/gengtype-parse.cc +++ b/gcc/gengtype-parse.cc @@ -82,7 +82,6 @@ static const char *const token_names[] = { "ptr_alias", "nested_ptr", "user", - "a param_is option", "a number", "a scalar type", "an identifier", @@ -95,7 +94,6 @@ static const char *const token_names[] = { /* This array is indexed by token code minus FIRST_TOKEN_WITH_VALUE. */ /* Keep in sync with 'gengtype.h:enum gty_token'. */ static const char *const token_value_format[] = { - "%s", "'%s'", "'%s'", "'%s'", diff --git a/gcc/gengtype.cc b/gcc/gengtype.cc index 54d3c8aaec3..49ddba684af 100644 --- a/gcc/gengtype.cc +++ b/gcc/gengtype.cc @@ -1388,8 +1388,6 @@ adjust_field_rtx_def (type_p t, options_p ARG_UNUSED (opt)) At present: - Converts pointer-to-char, with no length parameter, to TYPE_STRING; - Similarly for arrays of pointer-to-char; - - Converts structures for which a parameter is provided to - TYPE_PARAM_STRUCT; - Handles "special" options. */ @@ -3654,7 +3652,7 @@ write_func_for_structure (type_p orig_s, type_p s, } -/* Write out marker routines for STRUCTURES and PARAM_STRUCTS. */ +/* Write out marker routines for STRUCTURES. */ static void write_types (outf_p output_header, type_p structures, @@ -4002,7 +4000,7 @@ write_local_func_for_structure (const_type_p orig_s, type_p s) } } -/* Write out local marker routines for STRUCTURES and PARAM_STRUCTS. */ +/* Write out local marker routines for STRUCTURES. */ static void write_local (outf_p output_header, type_p structures) diff --git a/gcc/gengtype.h b/gcc/gengtype.h index 2122373edf2..13942900910 100644 --- a/gcc/gengtype.h +++ b/gcc/gengtype.h @@ -478,7 +478,6 @@ enum gty_token PTR_ALIAS, NESTED_PTR, USER_GTY, - UNUSED_PARAM_IS, NUM, SCALAR, ID, @@ -489,7 +488,7 @@ enum gty_token /* print_token assumes that any token >= FIRST_TOKEN_WITH_VALUE may have a meaningful value to be printed. */ - FIRST_TOKEN_WITH_VALUE = UNUSED_PARAM_IS + FIRST_TOKEN_WITH_VALUE = NUM }; -- 2.34.1