From patchwork Mon Mar 28 13:32:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 52407 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6C372385781F for ; Mon, 28 Mar 2022 13:34:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6C372385781F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1648474454; bh=RgQ70Z7+v7ta37MIU779inGiyef2N4k9Ymgb8B2N2uw=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=nPu+tiaBlp+I72nEfqmPuKERlC68dckuczi97ia5tJz7ptYKXAiTRDBPVsgEmUo3h fu9cPDJnV1wQZd2PP9r+FjFIUfohjFvRqVjmBNu4r1T+SDpQ9XTLn78+JCgiMM1KXC XsxvDPAAyc0eVrQGAesvPTOxnQQpENmc51SqZX4U= 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 EECB33857831 for ; Mon, 28 Mar 2022 13:33:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EECB33857831 Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-158-XCW-C3ESNwutbxSAmxBOLA-1; Mon, 28 Mar 2022 09:32:58 -0400 X-MC-Unique: XCW-C3ESNwutbxSAmxBOLA-1 Received: by mail-qv1-f71.google.com with SMTP id j8-20020ad454c8000000b0044111c17099so11381707qvx.0 for ; Mon, 28 Mar 2022 06:32:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=RgQ70Z7+v7ta37MIU779inGiyef2N4k9Ymgb8B2N2uw=; b=lTDkQxRe+0kfpyi9yoXjOcFHJpIaGQwlxJzlNT3t3vN4Vp1403MkxeC0dYk/Fm98iw Gph4e1CmtbinblREaMBtUNgq8NlmNYb7WELLdRRWBQTcDsYM4996HgYh5yOvHflKcdoc pWE9bNFssYfumvHJtvNqTQRzhec/2ZYGcV46oOiwz+9OYad7PaY4pPjvOBzH3bOECfjN hgSw7C7aI8/rLQ2zjL8b5qx8Uo8YrE18OAyPMaFTXQktNKAiE+79Agk2irZRjVZ357V3 Oq/bAZ2AZrMeK+vS3hddD1SJdKwNKgRSdplSC5bqAvWP2u818NWACZXyEVlCjliiymKY Rhiw== X-Gm-Message-State: AOAM5326MP/vLsM6OyG1oHZ+nEvOVA6ISIdi4wfZnTTJ5/6p5zrjFv3n oOkrOXZ31vifYyFY4FMQcMczewukFZQXlqvZLLSDCR6jSZ7swzF2pR4ANhwRGuVOjSOxWkDvSd2 mSDeMeoURbxvOg6y4UQwo6XEzs4cJSwgZG7BmWkbQxdftwvuSmJ8E6CYQBRcdZ5l9Ng== X-Received: by 2002:a37:414c:0:b0:67e:6d68:c585 with SMTP id o73-20020a37414c000000b0067e6d68c585mr15744295qka.196.1648474378109; Mon, 28 Mar 2022 06:32:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz3oOmXBEV2dm7goBnuq897K10x7erbe+TA16OXW0U7onOH0Z+VVqaRc/wWDzV57rgAcOWjaQ== X-Received: by 2002:a37:414c:0:b0:67e:6d68:c585 with SMTP id o73-20020a37414c000000b0067e6d68c585mr15744249qka.196.1648474377648; Mon, 28 Mar 2022 06:32:57 -0700 (PDT) Received: from barrymore.redhat.com (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id p13-20020a05622a048d00b002e1ce0c627csm13144616qtx.58.2022.03.28.06.32.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Mar 2022 06:32:56 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: mangling union{1} in template [PR104847] Date: Mon, 28 Mar 2022 09:32:55 -0400 Message-Id: <20220328133255.2582831-1-jason@redhat.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.5 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_LOW, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" My implementation of union non-type template arguments in r11-2016 broke braced casts of union type, because they are still in syntactic (undigested) form. Tested x86_64-pc-linux-gnu, applying to trunk. PR c++/104847 gcc/cp/ChangeLog: * mangle.cc (write_expression): Don't write a union designator when undigested. gcc/testsuite/ChangeLog: * g++.dg/abi/mangle-union1.C: New test. --- gcc/cp/mangle.cc | 2 +- gcc/testsuite/g++.dg/abi/mangle-union1.C | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/abi/mangle-union1.C base-commit: bc86a86a4f2c057bc0e0be94dcbb8c128ae7f717 prerequisite-patch-id: 09e711b54e7911a4a04bd7808abc1b73ae4482ba prerequisite-patch-id: 566cf0772894d0c6a842b2e0ca62eb1d5ae8ad33 diff --git a/gcc/cp/mangle.cc b/gcc/cp/mangle.cc index dbcec0a55bc..eb53e0ebeb4 100644 --- a/gcc/cp/mangle.cc +++ b/gcc/cp/mangle.cc @@ -3363,7 +3363,7 @@ write_expression (tree expr) { if (i > last_nonzero) break; - if (TREE_CODE (etype) == UNION_TYPE) + if (!undigested && TREE_CODE (etype) == UNION_TYPE) { /* Express the active member as a designator. */ write_string ("di"); diff --git a/gcc/testsuite/g++.dg/abi/mangle-union1.C b/gcc/testsuite/g++.dg/abi/mangle-union1.C new file mode 100644 index 00000000000..f2ee4576adf --- /dev/null +++ b/gcc/testsuite/g++.dg/abi/mangle-union1.C @@ -0,0 +1,10 @@ +// PR c++/104847 +// { dg-do compile { target c++11 } } + +struct S { int i; }; +union U { S k; }; +template T sink(T&&, Ts&&...); +template +decltype(sink(U{1},T())) f(T) { return U{1}; } +int main() { f(3); } +// { dg-final { scan-assembler "_Z1fIiEDTcl4sinktl1ULi1EEcvT__EEES1_" } }