From patchwork Sun Feb 27 22:52:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1598427 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=h3lYZAqh; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4K6JhC5bccz9sGV for ; Mon, 28 Feb 2022 09:53:14 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 482DC385842D for ; Sun, 27 Feb 2022 22:53:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 482DC385842D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1646002383; bh=sh+MhWtgLON/TQ3kW1QoPhWsZpdEP/xSTcAN7PEfDLM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=h3lYZAqhD/ZN8iNRmcBY8sVfLupGX8lEUhSA9DmWuGu+aY0J+Nlx6qzFmBxdSuPzO /zDjFEkpG0xYah1c3cTSmYIYlNJy3H6SvbxM/cGRdHsC2pj8OL/8vtlXfWt9aZHjOr RyiQW+Byb/8I4h3YQkOkN3FTRMC5bJjjymJJMwqQ= 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 [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 78F453858D35 for ; Sun, 27 Feb 2022 22:52:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 78F453858D35 Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-480-rc88sUEBOGeJC6lXRvVkuw-1; Sun, 27 Feb 2022 17:52:20 -0500 X-MC-Unique: rc88sUEBOGeJC6lXRvVkuw-1 Received: by mail-qt1-f197.google.com with SMTP id y1-20020ac87041000000b002c3db9c25f8so5182417qtm.5 for ; Sun, 27 Feb 2022 14:52:20 -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:subject:date:message-id:mime-version :content-transfer-encoding; bh=sh+MhWtgLON/TQ3kW1QoPhWsZpdEP/xSTcAN7PEfDLM=; b=zDhiZXJB1AaRCw1hwJ1ohtYugnx5TeEunPUZMwy0N490UteMt+q3EVKtPpqYtD9lMe DrFpCb01Jf565AvpLNSpWzzQTaXDnh/pcbotX+eLWC8asfVcLn/2+spHKy2CUcr58lDC Xg2iyUTaf/bXdNaxymrMbG1doPjuf+jAmwwfGWfDJF0Xn6T/Plb51luwDKW3iKGWZ3yr K8kYAT7JV+u1WSIqCywvBjUP533SHfKKqWJs/EbCFgCaS6MGZgoswuFhGSsyU3bQKyIB scL3TR9mPvm641sauSP7splBOYC+EHi5WJQ0wVHXaqiNn4AydRT2U0jjk/AyJJT4jLBq ubGQ== X-Gm-Message-State: AOAM5325WV4RNLfnu4wjG7/ih+7pOkg34DeUmmEpcGLTqVrrsd+rdGAB teLRRJ2Lt33qs1OGWGbxBlZ0rn1oO1TRMzrgRbyltEF2vPnKZCmykXk0KnaGXHGH3gBNSoxvKcr hvL2g1XIkhjsW8Kv8eFIjv4EnxOc7reTuY2NkZoLQBEaqLDbB8TwwI/Jt0krB3I+dKg== X-Received: by 2002:ac8:57cc:0:b0:2de:6f5c:2d85 with SMTP id w12-20020ac857cc000000b002de6f5c2d85mr14640895qta.108.1646002339271; Sun, 27 Feb 2022 14:52:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJySwtiS7RGFRifsGo8ls1xlqMaqw69T5oCCiyu8RWJPqLkv5QyaN4uUbpXVExhwxQNAj8GAyg== X-Received: by 2002:ac8:57cc:0:b0:2de:6f5c:2d85 with SMTP id w12-20020ac857cc000000b002de6f5c2d85mr14640885qta.108.1646002338812; Sun, 27 Feb 2022 14:52:18 -0800 (PST) Received: from barrymore.cygnus.csb ([70.45.227.144]) by smtp.gmail.com with ESMTPSA id s18-20020a05622a179200b002de9529450csm5866993qtk.85.2022.02.27.14.52.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Feb 2022 14:52:17 -0800 (PST) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: (*(fn))() [PR104618] Date: Sun, 27 Feb 2022 18:52:15 -0400 Message-Id: <20220227225215.54574-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=-14.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_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" The patch for PR90451 deferred marking to the point of actual use; we missed this one because of the parens. Tested x86_64-pc-linux-gnu, applying to trunk. PR c++/104618 gcc/cp/ChangeLog: * typeck.cc (cp_build_addr_expr_1): Also maybe_undo_parenthesized_ref. gcc/testsuite/ChangeLog: * g++.dg/overload/paren1.C: New test. --- gcc/cp/typeck.cc | 6 +++--- gcc/testsuite/g++.dg/overload/paren1.C | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/g++.dg/overload/paren1.C base-commit: d1574a9b820f17adb9004255e2018967e9be063b diff --git a/gcc/cp/typeck.cc b/gcc/cp/typeck.cc index f796337f73c..bddc83759ad 100644 --- a/gcc/cp/typeck.cc +++ b/gcc/cp/typeck.cc @@ -6884,9 +6884,9 @@ cp_build_addr_expr_1 (tree arg, bool strict_lvalue, tsubst_flags_t complain) so we can just form an ADDR_EXPR with the correct type. */ if (processing_template_decl || TREE_CODE (arg) != COMPONENT_REF) { - tree stripped_arg = tree_strip_any_location_wrapper (arg); - if (TREE_CODE (stripped_arg) == FUNCTION_DECL - && !mark_used (stripped_arg, complain) && !(complain & tf_error)) + tree stripped_arg + = tree_strip_any_location_wrapper (maybe_undo_parenthesized_ref (arg)); + if (!mark_single_function (stripped_arg, complain)) return error_mark_node; val = build_address (arg); if (TREE_CODE (arg) == OFFSET_REF) diff --git a/gcc/testsuite/g++.dg/overload/paren1.C b/gcc/testsuite/g++.dg/overload/paren1.C new file mode 100644 index 00000000000..21421ae8726 --- /dev/null +++ b/gcc/testsuite/g++.dg/overload/paren1.C @@ -0,0 +1,7 @@ +// PR c++/104618 + +extern void gen_addsi3 (void); +void output_stack_adjust () +{ + (*(gen_addsi3)) (); +}