From patchwork Wed Jan 2 19:58:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 209140 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 236432C0089 for ; Thu, 3 Jan 2013 06:58:29 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1357761510; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=XzuKaOi cDgMBYKdrybOHlrP5pRc=; b=K9fRyW/S+IwNwDd4eAjpbL5WsPYvIMEPelK+AvA GA8RAr2rEKvUV2eRPopK3oi0oSYB3YMwYDJDE+JkYU/VD8scbYptbHdp9uoGuxpu kgmksTDR8qfMNIqFnvQa6n2rdjNUUi1PkYvgapHKeSxGZUMhmVU/JBQQUSI4nQNd I+1w= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=rQFhJFgwigEYS3hkDKPnzRbI95jN2RwypXFVX5aTJBzVnWyF1U7F+T09zZIzw5 P1lRerWAER9tOFZJVJeJ4WBm4dyPEd9aWt8fTX99lq8U3RekCsk7F80u04DqURTw zGz/eLJsaFlqu/WOctSncR0oQd6UkXBxheAAou3p80CLU=; Received: (qmail 11024 invoked by alias); 2 Jan 2013 19:58:20 -0000 Received: (qmail 10988 invoked by uid 22791); 2 Jan 2013 19:58:19 -0000 X-SWARE-Spam-Status: No, hits=-6.2 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_SPAMHAUS_DROP, 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, 02 Jan 2013 19:58:07 +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 r02Jw73R001622 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 2 Jan 2013 14:58:07 -0500 Received: from [10.3.113.38] (ovpn-113-38.phx2.redhat.com [10.3.113.38]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r02Jw6ae001116; Wed, 2 Jan 2013 14:58:07 -0500 Message-ID: <50E4914E.8030706@redhat.com> Date: Wed, 02 Jan 2013 14:58:06 -0500 From: Jason Merrill User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: gcc-patches List CC: Jakub Jelinek Subject: C++ PATCH for KDE default argument issue 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 Jakub sent me a testcase from KDE that has started failing since my change to how default argument conversions are checked; we were ignoring 'explicit' when considering applicable conversions. Tested x86_64-pc-linux-gnu, applying to trunk. commit 31f87e04a3bcdfe18c2672fe9725d96117a95031 Author: Jason Merrill Date: Wed Jan 2 14:14:24 2013 -0500 * decl.c (check_default_argument): Use LOOKUP_IMPLICIT. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 64bd4b5..52ceefc 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -10829,7 +10829,7 @@ check_default_argument (tree decl, tree arg) parameter type. */ ++cp_unevaluated_operand; perform_implicit_conversion_flags (decl_type, arg, tf_warning_or_error, - LOOKUP_NORMAL); + LOOKUP_IMPLICIT); --cp_unevaluated_operand; if (warn_zero_as_null_pointer_constant diff --git a/gcc/testsuite/g++.dg/overload/defarg7.C b/gcc/testsuite/g++.dg/overload/defarg7.C new file mode 100644 index 0000000..8cc08f5 --- /dev/null +++ b/gcc/testsuite/g++.dg/overload/defarg7.C @@ -0,0 +1,12 @@ +struct A +{ + A(const char *); + explicit A(const int *); +}; + +void f (A a = 0); + +int main() +{ + f(); +}