From patchwork Wed Nov 2 20:33:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 14476 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp127974wru; Wed, 2 Nov 2022 13:34:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6Fzn2E3uHLRrJpyz0XrorT/t3Y/X76H0mKGJWuVJOU5wyKx63ZkOvldBGWn4zWj9kDHSrg X-Received: by 2002:a05:6402:540d:b0:450:bda7:f76e with SMTP id ev13-20020a056402540d00b00450bda7f76emr5520080edb.249.1667421283097; Wed, 02 Nov 2022 13:34:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667421283; cv=none; d=google.com; s=arc-20160816; b=TauJxULpFMi2KntEe/vLPRKjj1jLJObfG1ro7tMpm606pHAOWGOfqDtla/qDM52aZY M/Fow5ZdPvmjjRQTpoT2e1e6wJIR1xra/6MTRS0jVCp/Jiq6ACDcd1bvkK0m/a9V7B9p tnKCC+lmRonaqzr7Lg1nVPMS+cEXbN26ORSwIoPBPMvLDJJHC8e2C+gEZWuXsWHiLcdu V687JcdlnZWoEoamvfIv5vrbS+nw1KosdZz7pNc8jOC+pc9R1P0ip7kXzolLCrEg1oYs 9AKDhv/PaUtkiAYTa5u9c95NArf1+N6iuT9q1OtOgmTljFyCqkFAnBIiSmz7JjIjltPX 79ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=29oWfHIWTK4U5YydhvdctPVQhUwvDjxOx6QyelW6z/M=; b=HlAk+t5NMdrNFvR1qa3SEYIgVf11NEMme4z2YYDi9mX7koCKLP9fi/Mx7mDMf1KYlq MUmWdz2KL7azKbxHU5RlD5n3kxV93T3O19MV3di2el4wLMAZRaV1kkdKYr0j8ulKDT/2 wl88diqDXlDWHUvCR13/HHP6/TbmLaJ4FuxfU3x+q9IFNFvGzxSlgIYHRLR1XbwuLX5V ewJys8ubhZ0PkeQw3GxEJuq1YDcDiqJdREkxG0Zufeg7nyn/PdbCUV46aQjENxbjOM0Z KPBbP3B/ILzXyfLjA+0z7lb46eTWd+eApB7Sjs+xqwVPrIlzFYaAAlcrgwcvqiYJmuu3 xeOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="CjMHgEu/"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id d21-20020a056402517500b0045938ab7129si13133552ede.330.2022.11.02.13.34.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Nov 2022 13:34:43 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="CjMHgEu/"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E8F95385696E for ; Wed, 2 Nov 2022 20:34:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E8F95385696E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667421259; bh=29oWfHIWTK4U5YydhvdctPVQhUwvDjxOx6QyelW6z/M=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=CjMHgEu/O+VANCgPSX9tVNS6l2WUik+8X0EM6ywGSQkS1LbC8jIniiT1p6VBloqG/ SLPNXJX1GT1+wqFGbLoQ6qpnuEuzOsgbXezm9Dj42cMzPI6+UqhrCEE7GgaVhrFyIW DzDcXobz/aMXpOQoKGcJDEu6+qH8rKCqI7pg27wU= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id D502138582A6 for ; Wed, 2 Nov 2022 20:33:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D502138582A6 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-86-cYwQGRaLOGeAgDLNXoYL1g-1; Wed, 02 Nov 2022 16:33:33 -0400 X-MC-Unique: cYwQGRaLOGeAgDLNXoYL1g-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5D465185A78F; Wed, 2 Nov 2022 20:33:33 +0000 (UTC) Received: from localhost (unknown [10.33.37.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2838040C94AA; Wed, 2 Nov 2022 20:33:33 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Remove more redundant union members Date: Wed, 2 Nov 2022 20:33:32 +0000 Message-Id: <20221102203332.672558-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748417939253442767?= X-GMAIL-MSGID: =?utf-8?q?1748417939253442767?= Tested powerpc64le-linux. Pushed to trunk. -- >8 -- We don't need these 'unused' members because they're never used, and a union with a single variant member is fine. libstdc++-v3/ChangeLog: * libsupc++/eh_globals.cc (constant_init::unused): Remove. * src/c++11/system_error.cc (constant_init::unused): Remove. * src/c++17/memory_resource.cc (constant_init::unused): Remove. --- libstdc++-v3/libsupc++/eh_globals.cc | 1 - libstdc++-v3/src/c++11/system_error.cc | 1 - libstdc++-v3/src/c++17/memory_resource.cc | 1 - 3 files changed, 3 deletions(-) diff --git a/libstdc++-v3/libsupc++/eh_globals.cc b/libstdc++-v3/libsupc++/eh_globals.cc index 0aadb692a96..12abfc10521 100644 --- a/libstdc++-v3/libsupc++/eh_globals.cc +++ b/libstdc++-v3/libsupc++/eh_globals.cc @@ -73,7 +73,6 @@ namespace struct constant_init { union { - unsigned char unused; __cxa_eh_globals obj; }; constexpr constant_init() : obj() { } diff --git a/libstdc++-v3/src/c++11/system_error.cc b/libstdc++-v3/src/c++11/system_error.cc index 8c13642408d..5707e6b61d6 100644 --- a/libstdc++-v3/src/c++11/system_error.cc +++ b/libstdc++-v3/src/c++11/system_error.cc @@ -49,7 +49,6 @@ namespace struct constant_init { union { - unsigned char unused; T obj; }; constexpr constant_init() : obj() { } diff --git a/libstdc++-v3/src/c++17/memory_resource.cc b/libstdc++-v3/src/c++17/memory_resource.cc index 8bc55a69f1f..651d07489aa 100644 --- a/libstdc++-v3/src/c++17/memory_resource.cc +++ b/libstdc++-v3/src/c++17/memory_resource.cc @@ -82,7 +82,6 @@ namespace pmr struct constant_init { union { - unsigned char unused; T obj; }; constexpr constant_init() : obj() { }