From patchwork Wed Feb 24 19:49:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 587628 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 880F4140C90 for ; Thu, 25 Feb 2016 06:49:52 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=YyCORIfD; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :date:to:cc:subject:in-reply-to:message-id:references :mime-version:content-type; q=dns; s=default; b=OLKAm+MMdw67oNLo QXqpF44sQUqkBMNEcrs4R3TxwIgg+OuFqgg2nfnapAmwokYw7ds1afk0+kxIvRnG WQIq8Nu+h9aR+COdlKJsdUO6mV8NoQYNKDzRvYJhwtb4Wj++1Yjos4f90YfvL0fQ QDAMCa4UBSe6JIFU1xm1hQSzVIQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :date:to:cc:subject:in-reply-to:message-id:references :mime-version:content-type; s=default; bh=Cm1Bm913igTD4OQtq30SGn UZkR0=; b=YyCORIfDNQpb5q7EeGpMVbt76RNfzt08D2IWA0ebxOFw6KJiyRunlj 8ByvPYcNhNxFEnDTAkafFQ3N7FSfqkgwPHdqbB5aicHK0RUY1s8SSHCBzq9t8ZHR GJrBx8ENq26ZiAYn2IQZxGKBeUi0fTjw/sfDFkNYXpYbbR7x9KnYQ= Received: (qmail 119716 invoked by alias); 24 Feb 2016 19:49:45 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 119683 invoked by uid 89); 24 Feb 2016 19:49:44 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy=1, 31 X-HELO: mail-qg0-f49.google.com Received: from mail-qg0-f49.google.com (HELO mail-qg0-f49.google.com) (209.85.192.49) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Wed, 24 Feb 2016 19:49:43 +0000 Received: by mail-qg0-f49.google.com with SMTP id y89so22906172qge.2 for ; Wed, 24 Feb 2016 11:49:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:date:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version:content-type; bh=6lT2f8KJjgw9hMir7fKoTALsDOBR+lCHdzy9is3lPNw=; b=RVdDLAh7Uy2X8645JCJ5efxHgRl/8BafBKREykJ7xe4Nv7+DBJJ6+D5QhIdGGcfi9N H63WKqVQi6HmNqDBQNAwu618917lF71aCSbsX5su0jzPrtT3VEFcMIq58+qxZpHBiWeG e2rV6SNxXBmz2xAF8/7taVaZutb9JCg0tGSRMbRaVykrqDYkzqDvrQ2Kpftsw4EZIK8C ezVgUwMhNYaDEJPjThjxtItx7fONQk8ayA/uzQ9vog3Kp1uxvd/ugmdHXMClwRl+Bf0K +/9xYa4Nc14kIgr1LugPYJ/3TFkFMfHMpXMb4S5KdRoRGc9w2W47l7gAfubEcHRuSYvk RpEw== X-Gm-Message-State: AG10YOSLQV4y5gbytaL9w8k8nASYUOxfS7UJzbvJsJgxhGpIYVzUTPYIzJ5I5nO6hGbCYA== X-Received: by 10.140.159.203 with SMTP id f194mr54441784qhf.18.1456343381166; Wed, 24 Feb 2016 11:49:41 -0800 (PST) Received: from [192.168.1.130] (ool-4353abbc.dyn.optonline.net. [67.83.171.188]) by smtp.gmail.com with ESMTPSA id c2sm1815937qkb.41.2016.02.24.11.49.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Feb 2016 11:49:40 -0800 (PST) From: Patrick Palka X-Google-Original-From: Patrick Palka Date: Wed, 24 Feb 2016 14:49:39 -0500 (EST) To: Jason Merrill cc: Patrick Palka , Marek Polacek , gcc-patches@gcc.gnu.org Subject: Re: [PATCH] Fix PR c++/69736 In-Reply-To: <56CDB56D.7040009@redhat.com> Message-ID: References: <1456239521-25908-1-git-send-email-patrick@parcs.ath.cx> <20160223153144.GJ14947@redhat.com> <56CDB56D.7040009@redhat.com> User-Agent: Alpine 2.20.9 (DEB 106 2015-09-22) MIME-Version: 1.0 On Wed, 24 Feb 2016, Jason Merrill wrote: > On 02/23/2016 11:24 AM, Patrick Palka wrote: >> 1. making tsubst_copy_and_build retain the REF_PARENTHESIZED_P flag when >> processing an INDIRECT_REF, or by > > This should happen in any case. > >> 2. moving the call to maybe_undo_parenthesized_ref in finish_call_expr >> before >> the assignment of orig_fn so that orig_fn will be un-obfuscated as well, or >> by > > This would also be OK; at this point we know the expression isn't the operand > of decltype. Here's an updated patch that does both these things. Does it look OK to commit after testing? -- >8 -- gcc/cp/ChangeLog: PR c++/69736 * cp-tree.h (REF_PARENTHESIZED_P): Adjust documentation. (maybe_undo_parenthesized_ref): Declare. * semantics.c (maybe_undo_parenthesized_ref): Split out from check_return_expr. (finish_call_expr): Use it. * typeck.c (check_return_expr): Use it. * pt.c (tsubst_copy_and_build) [INDIRECT_REF]: Retain the REF_PARENTHESIZED_P flag. gcc/testsuite/ChangeLog: PR c++/69736 * g++.dg/cpp1y/paren2.C: New test. --- gcc/cp/cp-tree.h | 3 ++- gcc/cp/pt.c | 4 ++++ gcc/cp/semantics.c | 28 ++++++++++++++++++++++++++++ gcc/cp/typeck.c | 12 +----------- gcc/testsuite/g++.dg/cpp1y/paren2.C | 31 +++++++++++++++++++++++++++++++ 5 files changed, 66 insertions(+), 12 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp1y/paren2.C diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 3c23a83a..88c6367 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -3393,7 +3393,7 @@ extern void decl_shadowed_for_var_insert (tree, tree); TREE_LANG_FLAG_0 (STRING_CST_CHECK (NODE)) /* Indicates whether a COMPONENT_REF has been parenthesized, or an - INDIRECT_REF comes from parenthesizing a VAR_DECL. Currently only set + INDIRECT_REF comes from parenthesizing a _DECL. Currently only set some of the time in C++14 mode. */ #define REF_PARENTHESIZED_P(NODE) \ @@ -6361,6 +6361,7 @@ extern tree finish_label_stmt (tree); extern void finish_label_decl (tree); extern cp_expr finish_parenthesized_expr (cp_expr); extern tree force_paren_expr (tree); +extern tree maybe_undo_parenthesized_ref (tree); extern tree finish_non_static_data_member (tree, tree, tree); extern tree begin_stmt_expr (void); extern tree finish_stmt_expr_expr (tree, tree); diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 4785aa4..f74e9bb 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -15965,6 +15965,10 @@ tsubst_copy_and_build (tree t, else r = build_x_indirect_ref (input_location, r, RO_UNARY_STAR, complain|decltype_flag); + + if (TREE_CODE (r) == INDIRECT_REF) + REF_PARENTHESIZED_P (r) = REF_PARENTHESIZED_P (t); + RETURN (r); } diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 38c7516..109f82a 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -1673,6 +1673,30 @@ force_paren_expr (tree expr) return expr; } +/* If T is an id-expression obfuscated by force_paren_expr, undo the + obfuscation and return the underlying id-expression. Otherwise + return T. */ + +tree +maybe_undo_parenthesized_ref (tree t) +{ + if (cxx_dialect >= cxx14 + && INDIRECT_REF_P (t) + && REF_PARENTHESIZED_P (t)) + { + t = TREE_OPERAND (t, 0); + while (TREE_CODE (t) == NON_LVALUE_EXPR + || TREE_CODE (t) == NOP_EXPR) + t = TREE_OPERAND (t, 0); + + gcc_assert (TREE_CODE (t) == ADDR_EXPR + || TREE_CODE (t) == STATIC_CAST_EXPR); + t = TREE_OPERAND (t, 0); + } + + return t; +} + /* Finish a parenthesized expression EXPR. */ cp_expr @@ -2263,6 +2287,10 @@ finish_call_expr (tree fn, vec **args, bool disallow_virtual, gcc_assert (!TYPE_P (fn)); + /* If FN is a FUNCTION_DECL obfuscated by force_paren_expr, undo + it so that we can tell this is a call to a known function. */ + fn = maybe_undo_parenthesized_ref (fn); + orig_fn = fn; if (processing_template_decl) diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index d7ce327..3da6ea1 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -8929,17 +8929,7 @@ check_return_expr (tree retval, bool *no_warning) /* If we had an id-expression obfuscated by force_paren_expr, we need to undo it so we can try to treat it as an rvalue below. */ - if (cxx_dialect >= cxx14 - && INDIRECT_REF_P (retval) - && REF_PARENTHESIZED_P (retval)) - { - retval = TREE_OPERAND (retval, 0); - while (TREE_CODE (retval) == NON_LVALUE_EXPR - || TREE_CODE (retval) == NOP_EXPR) - retval = TREE_OPERAND (retval, 0); - gcc_assert (TREE_CODE (retval) == ADDR_EXPR); - retval = TREE_OPERAND (retval, 0); - } + retval = maybe_undo_parenthesized_ref (retval); /* Under C++11 [12.8/32 class.copy], a returned lvalue is sometimes treated as an rvalue for the purposes of overload resolution to diff --git a/gcc/testsuite/g++.dg/cpp1y/paren2.C b/gcc/testsuite/g++.dg/cpp1y/paren2.C new file mode 100644 index 0000000..b4a721f --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/paren2.C @@ -0,0 +1,31 @@ +// PR c++/69736 +// { dg-do compile { target c++14 } } + +void fn1(bool = true) +{ + (fn1)(); +} + +template +void fn2(T a = true) +{ + (fn1)(); +} + +void foo () +{ + (fn2)(); +} + +struct X +{ + static void fn3(bool = true) + { + (X::fn3)(); + } + + void fn4(bool = true) + { + (X::fn4)(); + } +};