diff options
| author | Jason Merrill <jason@redhat.com> | 2022-03-26 20:10:19 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2022-03-28 09:35:58 -0400 |
| commit | 71e1db540c01a13b01fae054c92878a79252b471 (patch) | |
| tree | 0e815254322a394d0b9745ec8f2e2704aab34aa6 /gcc | |
| parent | 07be8f8da4c6840a1fd6b2229b147e50cc6f03dc (diff) | |
| download | gcc-71e1db540c01a13b01fae054c92878a79252b471.zip gcc-71e1db540c01a13b01fae054c92878a79252b471.tar.gz gcc-71e1db540c01a13b01fae054c92878a79252b471.tar.bz2 | |
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.cc (write_expression): Don't write a union designator when
undigested.
gcc/testsuite/ChangeLog:
* g++.dg/abi/mangle-union1.C: New test.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/mangle.cc | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/abi/mangle-union1.C | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/gcc/cp/mangle.cc b/gcc/cp/mangle.cc index dbcec0a..eb53e0e 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 0000000..f2ee457 --- /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 <class T, class... Ts> T sink(T&&, Ts&&...); +template <class T> +decltype(sink(U{1},T())) f(T) { return U{1}; } +int main() { f(3); } +// { dg-final { scan-assembler "_Z1fIiEDTcl4sinktl1ULi1EEcvT__EEES1_" } } |