From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 346F03858D35 for ; Fri, 10 Dec 2021 15:41:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 346F03858D35 Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-589-HJxaXAvcMJynppNnpS59vQ-1; Fri, 10 Dec 2021 10:41:04 -0500 X-MC-Unique: HJxaXAvcMJynppNnpS59vQ-1 Received: by mail-qk1-f197.google.com with SMTP id v13-20020a05620a440d00b00468380f4407so10556006qkp.17 for ; Fri, 10 Dec 2021 07:41:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ukY7Y2PEVIAkyLA57ICpWj5QJG1dsFxCN1PV/pI3mOE=; b=pGU1BN3M0SL+znbxL53+gQaL4w2X2OoEK3qOLVNXRCcbTG1AVCRhp+u72n9y2r68Ez qDcQmw6dRjJKEFIAjY0ZNY3AhhH1aAXHkSRSghC73SJYcxz1gEEFoEismwO/vmwjO+c2 jGZM96FPZv166BiJxIHZiGoISwccpBFzOVeqxeTJsulrd3hAY5lrvCdHr+aS8zC81mXQ eiTuG1H2TYkpYi536MAsPlRT6ewnhByHE5wSICnY6cazlFtikBGBdu9DqtjI6WK6rM3Q pb3R/58QODtrB+J5QZXcCf0hpNyw/8UIKS43ynVUCWoq+C7XDZnMafYYsCgSxvwBCnvX kYUA== X-Gm-Message-State: AOAM531WkXD/TMzy96yhwvX+Ca+NKO0u2DcHOgBFCuXh9VFj65qTvyBH PaaKuU4HzoecaJyXQwygjS1dZDt+nxc+LnIczVO6jLkAa06xHpDIwHTGtn7sQHssqoQ3MMA3QzC 992ociYoiJPp4+UcMvrWxsea76/yBlH8qRsPsVmgkELg06OPefb1oP6QMaBe6krNaa4M= X-Received: by 2002:a05:6214:528c:: with SMTP id kj12mr27165780qvb.79.1639150863977; Fri, 10 Dec 2021 07:41:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJz9tKYTsRgh9p5TlBOROQVQnzzpnbyBD8UG1VMWjFbIl6nas2CktgqmQrV/dL+gFIxHATADrQ== X-Received: by 2002:a05:6214:528c:: with SMTP id kj12mr27165729qvb.79.1639150863632; Fri, 10 Dec 2021 07:41:03 -0800 (PST) Received: from localhost.localdomain (ool-457d493a.dyn.optonline.net. [69.125.73.58]) by smtp.gmail.com with ESMTPSA id i7sm1394169qkn.0.2021.12.10.07.41.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Dec 2021 07:41:03 -0800 (PST) From: Patrick Palka To: gcc-patches@gcc.gnu.org Subject: [PATCH] gengtype: remove "tree_exp" special attribute Date: Fri, 10 Dec 2021 10:41:01 -0500 Message-Id: <20211210154101.2898414-1-ppalka@redhat.com> X-Mailer: git-send-email 2.34.1.75.gabe6bb3905 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-Spam-Status: No, score=-15.9 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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-List-Received-Date: Fri, 10 Dec 2021 15:41:08 -0000 The function comment for adjust_field_tree_exp says this special case is for handling trees whose operands may contain pointers to RTL instead of to trees. But ever since r0-59671, which fixed/removed the last two tree codes for which this was possible (GOTO_SUBROUTINE_EXPR and WITH_CLEANUP_EXPR), this special attribute is largely a no-op. This patch removes it and instead just annotates struct tree_exp with the "length" attribute directly. Not sure it makes a difference, but I use %h instead of %0 in the "length" attribute to be consistent with other structures' "length" attributes within tree-core.h. This changes the code generated for TS_EXP handling in gt-cp-tree.h from: case TS_EXP: gt_ggc_m_9tree_node ((*x).generic.exp.typed.type); switch ((int) (TREE_CODE ((tree) &(*x)))) { default: { size_t i3; size_t l3 = (size_t)(TREE_OPERAND_LENGTH ((tree) &(*x))); for (i3 = 0; i3 != l3; i3++) { gt_ggc_m_9tree_node ((*x).generic.exp.operands[i3]); } } break; } break; to: case TS_EXP: { size_t l3 = (size_t)(TREE_OPERAND_LENGTH ((tree)&((*x).generic.exp))); gt_ggc_m_9tree_node ((*x).generic.exp.typed.type); { size_t i3; for (i3 = 0; i3 != l3; i3++) { gt_ggc_m_9tree_node ((*x).generic.exp.operands[i3]); } } } which seems equivalent and simpler. Boostrapped and regtested on x86_64-pc-linux-gnu, does this look OK for trunk? gcc/ChangeLog: * gengtype.c (adjust_field_tree_exp): Remove. (adjust_field_type): Don't handle the "tree_exp" special attribute. * tree-core.h (struct tree_exp): Replace special and desc attributes with length. --- gcc/gengtype.c | 35 +---------------------------------- gcc/tree-core.h | 4 +--- 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/gcc/gengtype.c b/gcc/gengtype.c index db218a7bce7..2dc443175fa 100644 --- a/gcc/gengtype.c +++ b/gcc/gengtype.c @@ -511,7 +511,6 @@ pair_p typedefs = NULL; type_p structures = NULL; pair_p variables = NULL; -static type_p adjust_field_tree_exp (type_p t, options_p opt); static type_p adjust_field_rtx_def (type_p t, options_p opt); /* Define S as a typedef to T at POS. */ @@ -1384,36 +1383,6 @@ adjust_field_rtx_def (type_p t, options_p ARG_UNUSED (opt)) nodot, NULL); } -/* Handle `special("tree_exp")'. This is a special case for - field `operands' of struct tree_exp, which although it claims to contain - pointers to trees, actually sometimes contains pointers to RTL too. - Passed T, the old type of the field, and OPT its options. Returns - a new type for the field. */ - -static type_p -adjust_field_tree_exp (type_p t, options_p opt ATTRIBUTE_UNUSED) -{ - pair_p flds; - options_p nodot; - - if (t->kind != TYPE_ARRAY) - { - error_at_line (&lexer_line, - "special `tree_exp' must be applied to an array"); - return &string_type; - } - - nodot = create_string_option (NULL, "dot", ""); - - flds = create_field (NULL, t, ""); - flds->opt = create_string_option (nodot, "length", - "TREE_OPERAND_LENGTH ((tree) &%0)"); - flds->opt = create_string_option (flds->opt, "default", ""); - - return new_structure ("tree_exp_subunion", TYPE_UNION, &lexer_line, flds, - nodot, NULL); -} - /* Perform any special processing on a type T, about to become the type of a field. Return the appropriate type for the field. At present: @@ -1447,9 +1416,7 @@ adjust_field_type (type_p t, options_p opt) && opt->kind == OPTION_STRING) { const char *special_name = opt->info.string; - if (strcmp (special_name, "tree_exp") == 0) - t = adjust_field_tree_exp (t, opt); - else if (strcmp (special_name, "rtx_def") == 0) + if (strcmp (special_name, "rtx_def") == 0) t = adjust_field_rtx_def (t, opt); else error_at_line (&lexer_line, "unknown special `%s'", special_name); diff --git a/gcc/tree-core.h b/gcc/tree-core.h index 91ae5237d7e..c48018999ce 100644 --- a/gcc/tree-core.h +++ b/gcc/tree-core.h @@ -1547,9 +1547,7 @@ enum omp_clause_linear_kind struct GTY(()) tree_exp { struct tree_typed typed; location_t locus; - tree GTY ((special ("tree_exp"), - desc ("TREE_CODE ((tree) &%0)"))) - operands[1]; + tree GTY ((length ("TREE_OPERAND_LENGTH ((tree)&%h)"))) operands[1]; }; /* Immediate use linking structure. This structure is used for maintaining -- 2.34.1.75.gabe6bb3905