From patchwork Fri Apr 28 10:58:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Carlini X-Patchwork-Id: 756338 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 3wDrRK5gvtz9rvt for ; Fri, 28 Apr 2017 20:59:09 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="nuqj5Ol4"; 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:to:cc :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=ZVPQKCDBsEA45ejqZ9Y3udGdWN/k/z4SQk2Co8Npbyh96sjsBQ yjnVAOV8A7VSeo0MzmpAeEQJnugEdnGWfcMYemDc78va6UPh7KWoNUa6LhCH9W3y CYpDYxWeyYk8/Al0q57Xs43n+J8FSmqJSRm/bZsTFcdSugIS4fspIP9ks= 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:to:cc :from:subject:message-id:date:mime-version:content-type; s= default; bh=SZ8dT9HEiTAOviRpEMD8tz6swV8=; b=nuqj5Ol4J61+lHrAMhL/ b6UjrZVX606AlGWpMQJ7/ry2XxDsu5q0hzLQVjqNfON/TnVCMH6xsHE+KhqGYjmx pj1VS0/cl8Wn/CB3LchhHPAqDT1t4WSZpoMdsKUVkOaPUP4qYwvtN72J4eCyEa+x HQJIzhbUhWjc2rE4ucVhR9U= Received: (qmail 87747 invoked by alias); 28 Apr 2017 10:58:58 -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 87726 invoked by uid 89); 28 Apr 2017 10:58:57 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.1 required=5.0 tests=BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=door X-HELO: userp1040.oracle.com Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 28 Apr 2017 10:58:56 +0000 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v3SAwsZr007131 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 28 Apr 2017 10:58:54 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id v3SAwrPP000384 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 28 Apr 2017 10:58:54 GMT Received: from abhmp0006.oracle.com (abhmp0006.oracle.com [141.146.116.12]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id v3SAwpRw016854; Fri, 28 Apr 2017 10:58:52 GMT Received: from [192.168.1.4] (/87.20.193.125) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 28 Apr 2017 03:58:51 -0700 To: "gcc-patches@gcc.gnu.org" Cc: Jason Merrill From: Paolo Carlini Subject: [C++ Patch] PR 71577 ("[6/7/8 regression] ICE on invalid C++11 code (with extra struct initializer): in digest_init_r...") Message-ID: <0e71a2d6-ae7b-36dd-a9e5-c50c207f8a35@oracle.com> Date: Fri, 28 Apr 2017 12:58:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 X-IsSubscribed: yes Hi, now that 7.1.0 is almost out of the door, I'm sending a few simple patches which I have been testing for a while in my trees. This one is about an error recovery regression: I think it's correct to handle it by simply returning unconditionally error_mark_node upon "too many initializers" error. Tested x86_64-linux. Thanks, Paolo. ////////////////// /cp 2017-04-28 Paolo Carlini PR c++/71577 * decl.c (reshape_init): Unconditionally return error_mark_node upon error about too many initializers. /testsuite 2017-04-28 Paolo Carlini PR c++/71577 * g++.dg/cpp0x/pr71577.C: New. Index: cp/decl.c =================================================================== --- cp/decl.c (revision 247273) +++ cp/decl.c (working copy) @@ -6118,8 +6118,7 @@ reshape_init (tree type, tree init, tsubst_flags_t { if (complain & tf_error) error ("too many initializers for %qT", type); - else - return error_mark_node; + return error_mark_node; } if (CONSTRUCTOR_IS_DIRECT_INIT (init) Index: testsuite/g++.dg/cpp0x/pr71577.C =================================================================== --- testsuite/g++.dg/cpp0x/pr71577.C (revision 0) +++ testsuite/g++.dg/cpp0x/pr71577.C (working copy) @@ -0,0 +1,4 @@ +// PR c++/71577 +// { dg-do compile { target c++11 } } + +struct { int a; } s1, s2 = { s1, 0 }; // { dg-error "too many initializers" }