From patchwork Thu Nov 4 15:52:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 47059 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A17D73858439 for ; Thu, 4 Nov 2021 15:54:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A17D73858439 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1636041292; bh=FuVGLC1IW0lRhQCGItQVGE8T72BCV2MwiWBk/+2ftxs=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=QDqdN17VgSfTAMLVy70rCQvZGPzIQ5+vHfJ8MGF6AKG9A5tuZMipu5CBQy2ISSvHa ha2C/QPcpXRySaaTqIJ2WhWcQJuqz04pWjfY8WtkxBywbFIdAV1bEUZbLMvd4rmJ3H bGzmfHDFOGU91fa9Txg8Wy/tjpAYv/GeIItuf4r4= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTPS id C9E893857C5F for ; Thu, 4 Nov 2021 15:52:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C9E893857C5F Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-437-pgBloteSN2mQ4CF58qWkmg-1; Thu, 04 Nov 2021 11:52:38 -0400 X-MC-Unique: pgBloteSN2mQ4CF58qWkmg-1 Received: by mail-qv1-f69.google.com with SMTP id j9-20020a05621419c900b003b815c01a54so5976894qvc.10 for ; Thu, 04 Nov 2021 08:52:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=FuVGLC1IW0lRhQCGItQVGE8T72BCV2MwiWBk/+2ftxs=; b=pbOlDUQB3Twz6SEzZ5WbTp3jIkd5vzMkv9L5b+jOc0Mx6UlMVQNjee2oIyBrqQQWjn UvbL4VBy41VpICZ3GMe7A2i8ID0izkYkhT/YF9lSkBY3H3JZJwNyyr84KyfMoNne+hvK /gNygaRoTk0uymXj8bo9LwJITm8/NZfxiYFDaRExRRmIa0eGHV3AKrFLKFsFl4et7Q5u VdIn8TpP3LsH0XsrUxW/0thiO976HueZQUuwKRg7g2TSBPH4UASnTUsRxx8wJ/ETEApq QdcgqTAqQBE9b066dSwnaCDWcGGJ4oP+OKv+Y4x9LmV0ZQQ9/0AwNskReOQ7BTeoKmTN NF8Q== X-Gm-Message-State: AOAM532wal1q/sWHcpU3l1LRvr7A6LU6vfNu9DLAMCf3e7pWC91ccnB+ R76XIC2MhzJB494JI8fXw1SYMKTdp1a917zjGA0dedJbq2gWki8YxcxOZxqyIh9WyNel5TirWR2 HuN5We2MzB5Xnkur8p1d1Lhy7TY/DHT9wzZj3+MARmDJB5DCHEU8V896NU69cy3de0w== X-Received: by 2002:ae9:de02:: with SMTP id s2mr41568654qkf.215.1636041157623; Thu, 04 Nov 2021 08:52:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzOiA5Fmnn/pL9iA6EfJ98TUVVp2ufUjB2W3QfTyM3ZU9djuuL9gE1uJKeIJ7hed/SHvzXVXg== X-Received: by 2002:ae9:de02:: with SMTP id s2mr41568612qkf.215.1636041157043; Thu, 04 Nov 2021 08:52:37 -0700 (PDT) Received: from barrymore.redhat.com (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id g8sm4119540qko.27.2021.11.04.08.52.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Nov 2021 08:52:36 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH RFA (print-tree)] c++: improve print_node of PTRMEM_CST Date: Thu, 4 Nov 2021 11:52:34 -0400 Message-Id: <20211104155234.1945303-1-jason@redhat.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.3 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_H2, 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-Patchwork-Original-From: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" It's been inconvenient that pretty-printing of PTRMEM_CST didn't display what member the constant refers to. Adding that is complicated by the absence of a langhook for CONSTANT_CLASS_P nodes; the simplest fix for that is to use the tcc_exceptional hook for tcc_constant as well. Tested x86_64-pc-linux-gnu. OK for trunk, or should I add a new hook for constants? gcc/cp/ChangeLog: * ptree.c (cxx_print_xnode): Handle PTRMEM_CST. gcc/ChangeLog: * print-tree.c (print_node): Also call print_xnode hook for tcc_constant class. --- gcc/cp/ptree.c | 3 +++ gcc/print-tree.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) base-commit: fae00a0ac0e5687343a60ae02bf60352002ab9aa diff --git a/gcc/cp/ptree.c b/gcc/cp/ptree.c index 1dcd764af01..9e981d656e3 100644 --- a/gcc/cp/ptree.c +++ b/gcc/cp/ptree.c @@ -379,6 +379,9 @@ cxx_print_xnode (FILE *file, tree node, int indent) if (tree message = STATIC_ASSERT_MESSAGE (node)) print_node (file, "message", message, indent+4); break; + case PTRMEM_CST: + print_node (file, "member", PTRMEM_CST_MEMBER (node), indent+4); + break; default: break; } diff --git a/gcc/print-tree.c b/gcc/print-tree.c index d1fbd044c27..b5dc523fcb1 100644 --- a/gcc/print-tree.c +++ b/gcc/print-tree.c @@ -1004,8 +1004,7 @@ print_node (FILE *file, const char *prefix, tree node, int indent, break; default: - if (EXCEPTIONAL_CLASS_P (node)) - lang_hooks.print_xnode (file, node, indent); + lang_hooks.print_xnode (file, node, indent); break; }