From patchwork Wed Mar 16 20:12:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 87299 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 3D6A7B6FAC for ; Thu, 17 Mar 2011 07:13:00 +1100 (EST) Received: (qmail 2689 invoked by alias); 16 Mar 2011 20:12:57 -0000 Received: (qmail 2671 invoked by uid 22791); 16 Mar 2011 20:12:55 -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; Wed, 16 Mar 2011 20:12:48 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p2GKCkbE017748 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 16 Mar 2011 16:12:47 -0400 Received: from [127.0.0.1] (ovpn-113-145.phx2.redhat.com [10.3.113.145]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p2GKCj8B020679 for ; Wed, 16 Mar 2011 16:12:46 -0400 Message-ID: <4D8119BD.7000705@redhat.com> Date: Wed, 16 Mar 2011 16:12:45 -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: Re: A couple of small C++ cleanup PATCHes References: <4D80E49E.8050109@redhat.com> In-Reply-To: <4D80E49E.8050109@redhat.com> 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 One more: I noticed that we were calling require_complete_type within template-specific code, but in a template require_complete_type just returns immediately. Tested x86_64-pc-linux-gnu, applying to trunk. commit 453649bdbc1189503b34774d5a6cf2470a6bcd12 Author: Jason Merrill Date: Wed Mar 16 14:16:27 2011 -0400 * call.c (build_over_call): Remove require_complete_type_sfinae call. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 436c956..d040ec8 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -5994,8 +5994,6 @@ build_over_call (struct z_candidate *cand, int flags, tsubst_flags_t complain) argarray); if (TREE_THIS_VOLATILE (fn) && cfun) current_function_returns_abnormally = 1; - if (!VOID_TYPE_P (return_type)) - require_complete_type_sfinae (return_type, complain); return convert_from_reference (expr); }