From patchwork Tue Feb 23 14:58:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 586895 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 D265E140778 for ; Wed, 24 Feb 2016 01:59:00 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=P1WFO5i+; 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 :to:cc:subject:date:message-id; q=dns; s=default; b=QzclHsvVISLj cHq7viJ0pO1trMDRhHl8fORtGzK7H5h3bLxyYeSAkIEcmzdBI0nU9ZmHefnVY9AG y4IhPWsg5zsZVOf5M0iK2a2v1gr5zQVKJ0Zhbn4EKj0WVrFmFLYE0ZIfBitIwSjP wtdWiP76xTnMe2NcQi5i/uq9akDXrts= 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 :to:cc:subject:date:message-id; s=default; bh=hS/XgcVGRxqiJDXWJ7 l1Ysbf724=; b=P1WFO5i+QEumXoR+kwGCfPxOj1kqYua13Zt67qvCS9Pthnymzp rKiEIBw3pT0AMaY4CAZxrFBirS2WoA9jTGERvnX34m2tVJnoifJwteWCfaOoa/gK c3f2qIkh/JBDEOEqhHrdS5N9ONGs1mC9rAU32+X/2wurI0gUxEQesCGTg= Received: (qmail 27597 invoked by alias); 23 Feb 2016 14:58:53 -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 25874 invoked by uid 89); 23 Feb 2016 14:58:52 -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=16736, 1673, 6, NODE, component_ref X-HELO: mail-qg0-f50.google.com Received: from mail-qg0-f50.google.com (HELO mail-qg0-f50.google.com) (209.85.192.50) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Tue, 23 Feb 2016 14:58:51 +0000 Received: by mail-qg0-f50.google.com with SMTP id y9so139608847qgd.3 for ; Tue, 23 Feb 2016 06:58:50 -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:to:cc:subject:date:message-id; bh=LLu3AD8NTyEeCqknJpy3uDsrnuYw6ccBEiwvg3c0IZ4=; b=c6wNdwf53CHaMqa01tqBoNTniJ4rKakOScKsHMDdyCFPQSPJOn6iKCoS6yuA8BiNOm 4DiL5LmDXcjSnpEuEiEED3A9kW7iSe2040KG/MXkLGkvFA2UkE03/vw2k9BvMkO7X7kk sCcblF+KSBaRNQlivmrYlDgOfpGoX3HIH83kMMeF7i3HuOg5eYbq+uKhwucmwa5Q+EAW BCdU2kZwgm2qWbVzbENjCMk9tnvb8UJ4oyE4Qymtyg7Opi93fEA5qrTU4Hg1kfZYhi+h HIuKjocjnNa2kbegnfOMX+/ujPTC3ELyqCt5MriXVnaHdMtNu6AtJ/pL9ZDpMfTgfjPs dGeg== X-Gm-Message-State: AG10YOTgSyTswdGgPEpBUv6F0w8uw2yrddwCoR0Hx9ASUy9CCth1ZAVbJGfXO4jjR6pDxQ== X-Received: by 10.140.100.244 with SMTP id s107mr40839333qge.19.1456239529123; Tue, 23 Feb 2016 06:58:49 -0800 (PST) Received: from localhost.localdomain (ool-4353abbc.dyn.optonline.net. [67.83.171.188]) by smtp.gmail.com with ESMTPSA id h5sm8551748qge.48.2016.02.23.06.58.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Feb 2016 06:58:47 -0800 (PST) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, Patrick Palka Subject: [PATCH] Fix PR c++/69736 Date: Tue, 23 Feb 2016 09:58:41 -0500 Message-Id: <1456239521-25908-1-git-send-email-patrick@parcs.ath.cx> finish_call_expr thinks that a call to a function which has been obfuscated by force_paren_expr is a call to an unknown function. This eventually leads us to not make use of the function's default arguments when processing the argument list. So a function call like f() may compile and yet (f)() may not, if f has defaulted arguments. This patch fixes this inconsistency by making finish_call_expr undo the obfuscation performed by force_paren_expr. Bootstrapped + regtested + boost-tested on x86_64-pc-linux-gnu, does this look OK to commit? 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. gcc/testsuite/ChangeLog: PR c++/69736 * g++.dg/cpp1y/paren2.C: New test. --- gcc/cp/cp-tree.h | 3 ++- gcc/cp/semantics.c | 28 ++++++++++++++++++++++++++++ gcc/cp/typeck.c | 12 +----------- gcc/testsuite/g++.dg/cpp1y/paren2.C | 25 +++++++++++++++++++++++++ 4 files changed, 56 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/semantics.c b/gcc/cp/semantics.c index 38c7516..e7f2e8b 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 @@ -2332,6 +2356,10 @@ finish_call_expr (tree fn, vec **args, bool disallow_virtual, && TREE_CODE (TREE_OPERAND (fn, 0)) == OVERLOAD) fn = TREE_OPERAND (fn, 0); + /* 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); + if (is_overloaded_fn (fn)) fn = baselink_for_fns (fn); 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..12462be --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/paren2.C @@ -0,0 +1,25 @@ +// PR c++/69736 + +void fn1(bool = true) +{ + (fn1)(); +} + +template +void fn2() +{ + (fn1)(); +} + +struct X +{ + static void fn3(bool = true) + { + (X::fn3)(); + } + + void fn4(bool = true) + { + (X::fn4)(); + } +};