From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id DCC8D3857C44; Mon, 28 Mar 2022 19:13:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DCC8D3857C44 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-9706] c++: mangling union{1} in template [PR104847] X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 14146bb58f279659279cd189bf95c3b0cb5fe1ac X-Git-Newrev: 07d7e8b8ae2879241207631fcaeaa83e5e85a240 Message-Id: <20220328191307.DCC8D3857C44@sourceware.org> Date: Mon, 28 Mar 2022 19:13:07 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Mar 2022 19:13:08 -0000 https://gcc.gnu.org/g:07d7e8b8ae2879241207631fcaeaa83e5e85a240 commit r11-9706-g07d7e8b8ae2879241207631fcaeaa83e5e85a240 Author: Jason Merrill Date: Sat Mar 26 20:10:19 2022 -0400 c++: mangling union{1} in template [PR104847] 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. PR c++/104847 gcc/cp/ChangeLog: * mangle.c (write_expression): Don't write a union designator when undigested. gcc/testsuite/ChangeLog: * g++.dg/abi/mangle-union1.C: New test. Diff: --- gcc/cp/mangle.c | 2 +- gcc/testsuite/g++.dg/abi/mangle-union1.C | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index 9f8872c9d07..96644b5cd9f 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -3342,7 +3342,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_" } }