From patchwork Fri Dec 7 10:10:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 204443 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 2F35F2C00C8 for ; Fri, 7 Dec 2012 21:10:31 +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=1355479832; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:Message-ID:Date:From:User-Agent:MIME-Version: To:CC:Subject:References:In-Reply-To:Content-Type:Mailing-List: Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:Sender:Delivered-To; bh=O2OqafwRl/sAzNPbmXkN2U12jKI=; b=W4IMHmnGAPiLl3qdeciQjEpuYbT+Q3V1LZubyLeqIC14EtRdcraQsF+h5xAEwm uyBRiCjVKDzPa/7wnvyBvvIZT64q1stJ6IYymF/UlYnpLAAjD74gfU+EoKHVPSYs mpoXR+ECa7GTY8aUVWDOY6eZ4etCSxr4XBvZpqkZajywE= 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:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:References:In-Reply-To:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=gkDLZWsCfEcoW/5sBeVJgjwmhWsDHI2LOreCq6zB0JZIaDzeCxETlvWesYey8j 8E4Gni9tj+KQU5y3OG3hyWoxxfweORIfYWlyfNAjr6MZ3vK7aCAlnCVUVrLr3Kbe TXuoFz/qcOLYyq3EP7tJTychoPDU8L8sr3KoXt1kcH3iU=; Received: (qmail 29988 invoked by alias); 7 Dec 2012 10:10:21 -0000 Received: (qmail 29973 invoked by uid 22791); 7 Dec 2012 10:10:19 -0000 X-SWARE-Spam-Status: No, hits=-5.4 required=5.0 tests=AWL, BAYES_00, KHOP_THREADED, RCVD_IN_HOSTKARMA_NO, RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 07 Dec 2012 10:10:14 +0000 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id qB7AACDQ001928 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 7 Dec 2012 10:10:13 GMT Received: from acsmt357.oracle.com (acsmt357.oracle.com [141.146.40.157]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id qB7AACaZ013630 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 7 Dec 2012 10:10:12 GMT Received: from abhmt116.oracle.com (abhmt116.oracle.com [141.146.116.68]) by acsmt357.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id qB7AACuZ014810; Fri, 7 Dec 2012 04:10:12 -0600 Received: from [192.168.1.4] (/79.52.234.135) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 07 Dec 2012 02:10:12 -0800 Message-ID: <50C1C082.4020601@oracle.com> Date: Fri, 07 Dec 2012 11:10:10 +0100 From: Paolo Carlini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: Matthias Klose CC: Jakub Jelinek , Jason Merrill , gcc-patches List Subject: Re: C++ PATCH for c++/54325 (wrong error initializing abstract base class) References: <50C1790B.3040704@redhat.com> <50C1B327.9060006@ubuntu.com> <20121207091715.GQ2315@tucnak.redhat.com> <50C1B5E1.2000602@ubuntu.com> In-Reply-To: <50C1B5E1.2000602@ubuntu.com> X-IsSubscribed: yes 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 Hi, On 12/07/2012 10:24 AM, Matthias Klose wrote: > committed. > > Matthias > > 2012-12-07 Matthias Klose > > * tree.c (build_aggr_init_expr): Add parameter name, mark as unused. Thanks. I was wondering if in mainline we could just do the below. It seems straightforward enough... Thanks! Paolo. /////////////////////// 2012-12-07 Paolo Carlini * tree.c (build_aggr_init_expr): Remove tsubst_flags_t parameter. (build_cplus_new): Adjust. * cp-tree.h: Adjust declaration. * init.c (build_value_init): Adjust. Index: cp-tree.h =================================================================== --- cp-tree.h (revision 194296) +++ cp-tree.h (working copy) @@ -5762,7 +5762,7 @@ extern tree build_min_nt_loc (location_t, enum t extern tree build_min_non_dep (enum tree_code, tree, ...); extern tree build_min_non_dep_call_vec (tree, tree, vec *); extern tree build_cplus_new (tree, tree, tsubst_flags_t); -extern tree build_aggr_init_expr (tree, tree, tsubst_flags_t); +extern tree build_aggr_init_expr (tree, tree); extern tree get_target_expr (tree); extern tree get_target_expr_sfinae (tree, tsubst_flags_t); extern tree build_cplus_array_type (tree, tree); Index: init.c =================================================================== --- init.c (revision 194296) +++ init.c (working copy) @@ -350,8 +350,7 @@ build_value_init (tree type, tsubst_flags_t compla (type, build_special_member_call (NULL_TREE, complete_ctor_identifier, NULL, type, LOOKUP_NORMAL, - complain), - complain); + complain)); else if (TYPE_HAS_COMPLEX_DFLT (type)) { /* This is a class that needs constructing, but doesn't have @@ -361,7 +360,7 @@ build_value_init (tree type, tsubst_flags_t compla tree ctor = build_special_member_call (NULL_TREE, complete_ctor_identifier, NULL, type, LOOKUP_NORMAL, complain); - ctor = build_aggr_init_expr (type, ctor, complain); + ctor = build_aggr_init_expr (type, ctor); if (ctor != error_mark_node) AGGR_INIT_ZERO_FIRST (ctor) = 1; return ctor; Index: tree.c =================================================================== --- tree.c (revision 194296) +++ tree.c (working copy) @@ -407,7 +407,7 @@ build_aggr_init_array (tree return_type, tree fn, callable. */ tree -build_aggr_init_expr (tree type, tree init, tsubst_flags_t /*complain*/) +build_aggr_init_expr (tree type, tree init) { tree fn; tree slot; @@ -469,7 +469,7 @@ tree tree build_cplus_new (tree type, tree init, tsubst_flags_t complain) { - tree rval = build_aggr_init_expr (type, init, complain); + tree rval = build_aggr_init_expr (type, init); tree slot; /* Make sure that we're not trying to create an instance of an