From patchwork Wed Mar 23 16:24:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 601283 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 3qVZfn3nLNz9s9Z for ; Thu, 24 Mar 2016 03:25:21 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=vp8pHmMe; 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:from :to:cc:subject:date:message-id; q=dns; s=default; b=EsxJtDcTGRcE laSceN4xoiDVjUTeAhX1I82Qi2e76tP/Vb6ABCW6PFiHhdFtQGkWWKM1DNwMIUbx sqoFuaMDM7wA4esxJ/7Qiyvlvq4Xa/4iVnlkbxXFVECTXnQsJFajU3ChQNDrYRuf 60BAx65Nmd4by1Z8M5lWsR1dPCOBmWQ= 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:from :to:cc:subject:date:message-id; s=default; bh=kLoEsYjWU1MQeFRQQL MBQt2QQcc=; b=vp8pHmMeHxvY5aGIb7rdConmXin6Ow3SJiPolEuiFtAp6JfqRL m2q68loCMPH9yr47o9GpWslN8CaqHvsHQ4nQkVwmXd/JeBS9/jfYMR7U+YBADZms 2SCKJpkiCh9B6Go5a2vZL1p8PXJ3stbrrBg0gpxUCUuwOHVmYjnynDoSw= Received: (qmail 53753 invoked by alias); 23 Mar 2016 16:25:09 -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 49965 invoked by uid 89); 23 Mar 2016 16:25:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy= X-HELO: mail-qk0-f170.google.com Received: from mail-qk0-f170.google.com (HELO mail-qk0-f170.google.com) (209.85.220.170) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Wed, 23 Mar 2016 16:24:47 +0000 Received: by mail-qk0-f170.google.com with SMTP id s5so8991908qkd.0 for ; Wed, 23 Mar 2016 09:24:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=+zmBzmXtHGfubdin7xQA26QCY7Cmk2dBbncauWBOqYc=; b=YDGYRZ4rgPoP4xP2TvwrNvAMjuXeq8U8FwwBn6vGvQMLnvgtiYD6M49WJLRhR+N+hq Jz7+hoOEJDSuHaQM8EgJJLjXHpYG0eUBQoyE2TiLBr0bK/IpelamC069n+dXjsh8lHIh JWL8PJ/+/HJrIoBFS03rmRvKEEbSXx0sF8+ptdgQPpW49GKtsVqQD4ZLXhZptTo1/Civ zD9pfWNN4lRQxIl47idVPOntE9uEoRDnlrAOPTTyVWkgzK/1oiP5mraDXO0w3PtqgeVs 1tRGJ1lX0KdHihPo1fHtSSdc9P1mDXV3ruWId/nwQG3N8uJu0ppP9Jh+bWPaGkaaiSJ+ IdJA== X-Gm-Message-State: AD7BkJJJkoFSa9xLdOPiG4W72WmzWY2Syl+A9uf4JaBa3o9cHbg3RzexaIGc0yetk3MH4Q== X-Received: by 10.55.73.199 with SMTP id w190mr4716646qka.77.1458750284858; Wed, 23 Mar 2016 09:24:44 -0700 (PDT) Received: from localhost.localdomain (ool-4353abbc.dyn.optonline.net. [67.83.171.188]) by smtp.gmail.com with ESMTPSA id q94sm1380432qgq.14.2016.03.23.09.24.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Mar 2016 09:24:44 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, Patrick Palka Subject: [PATCH] Fix PR c++/70347 (default member initializer not picked up by union) Date: Wed, 23 Mar 2016 12:24:39 -0400 Message-Id: <1458750279-4923-1-git-send-email-patrick@parcs.ath.cx> When performing aggregate initialization on a union we fail to take into account the union's NSDMI (if it has one). This patch teaches process_init_constructor_union to consider NSDMIs. Does this look OK to commit after bootstrap + regtest? gcc/cp/ChangeLog: PR c++/70347 * typeck.c (process_init_constructor_union): If the initializer is empty, use the union's NSDMI if it has one. gcc/testsuite/ChangeLog: PR c++/70347 * g++.dg/cpp1y/nsdmi-union1.C: New test. --- gcc/cp/typeck2.c | 19 ++++++++++++++++-- gcc/testsuite/g++.dg/cpp1y/nsdmi-union1.C | 33 +++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp1y/nsdmi-union1.C diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c index 2a76c96..4ab77cd 100644 --- a/gcc/cp/typeck2.c +++ b/gcc/cp/typeck2.c @@ -1499,9 +1499,24 @@ process_init_constructor_union (tree type, tree init, constructor_elt *ce; int len; - /* If the initializer was empty, use default zero initialization. */ + /* If the initializer was empty, use the union's NSDMI if it has one. + Otherwise use default zero initialization. */ if (vec_safe_is_empty (CONSTRUCTOR_ELTS (init))) - return 0; + { + for (tree field = TYPE_FIELDS (type); field; field = TREE_CHAIN (field)) + { + if (DECL_INITIAL (field)) + { + CONSTRUCTOR_APPEND_ELT (CONSTRUCTOR_ELTS (init), + field, + get_nsdmi (field, /*in_ctor=*/false)); + break; + } + } + + if (vec_safe_is_empty (CONSTRUCTOR_ELTS (init))) + return 0; + } len = CONSTRUCTOR_ELTS (init)->length (); if (len > 1) diff --git a/gcc/testsuite/g++.dg/cpp1y/nsdmi-union1.C b/gcc/testsuite/g++.dg/cpp1y/nsdmi-union1.C new file mode 100644 index 0000000..45b9fd0 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/nsdmi-union1.C @@ -0,0 +1,33 @@ +// PR c++/70347 +// { dg-do compile { target c++14 } } + +union A { + char a; + long b = -42; +}; + +struct B { + union { + char a = 10; + long b; + }; +}; + +A c1{}; +A c2{4}; +B c3{}; +B c4{{9}}; + +int main() { + if (c1.b != -42) + __builtin_abort (); + + if (c2.a != 4) + __builtin_abort (); + + if (c3.a != 10) + __builtin_abort (); + + if (c4.a != 9) + __builtin_abort (); +}