From patchwork Fri Mar 18 15:07:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 87539 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]) by ozlabs.org (Postfix) with SMTP id 056A5B6FA7 for ; Sat, 19 Mar 2011 02:07:43 +1100 (EST) Received: (qmail 26156 invoked by alias); 18 Mar 2011 15:07:41 -0000 Received: (qmail 26140 invoked by uid 22791); 18 Mar 2011 15:07:40 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_HI, SPF_HELO_PASS, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 18 Mar 2011 15:07:34 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p2IF7XkB006002 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 18 Mar 2011 11:07:33 -0400 Received: from [127.0.0.1] (ovpn-113-145.phx2.redhat.com [10.3.113.145]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p2IF7WUs031732 for ; Fri, 18 Mar 2011 11:07:32 -0400 Message-ID: <4D837533.5090307@redhat.com> Date: Fri, 18 Mar 2011 11:07:31 -0400 From: Jason Merrill User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.15) Gecko/20110307 Fedora/3.1.9-0.39.b3pre.fc14 Lightning/1.0b2 Thunderbird/3.1.9 MIME-Version: 1.0 To: gcc-patches List Subject: C++ PATCH for c++/48162 (ICE on call to function pointer returning a class) 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 My assert that there wouldn't be any more wrappers around the CALL_EXPR was overconfident; cp_build_function_call_vec still does argument conversions and uses build_cxx_call, which calls build_cplus_new to wrap a call returning a class in TARGET_EXPR. That should be fixed, but in the meantime let's not crash. Tested x86_64-pc-linux-gnu, applied to trunk. commit 37e18e28dd51f50d86be4ad48075ee855bc54a13 Author: Jason Merrill Date: Thu Mar 17 16:10:42 2011 -0400 PR c++/48162 * semantics.c (finish_call_expr): Allow TARGET_EXPR for now. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index b6d1008..41ab858 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -2155,6 +2155,9 @@ finish_call_expr (tree fn, VEC(tree,gc) **args, bool disallow_virtual, if (TREE_CODE (result) == INDIRECT_REF) result = TREE_OPERAND (result, 0); gcc_assert (TREE_CODE (result) == CALL_EXPR + /* FIXME cp_build_function_call_vec should avoid argument + and return transformations like build_over_call does. */ + || TREE_CODE (result) == TARGET_EXPR || TREE_CODE (fn) == PSEUDO_DTOR_EXPR || errorcount); result = build_call_vec (TREE_TYPE (result), orig_fn, orig_args); diff --git a/gcc/testsuite/g++.dg/template/fn-ptr1.C b/gcc/testsuite/g++.dg/template/fn-ptr1.C new file mode 100644 index 0000000..c0e7d98 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/fn-ptr1.C @@ -0,0 +1,5 @@ +// PR c++/48162 + +struct A { }; +A (*f)(); +template void g() { f(); }