aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/mangle.cc2
-rw-r--r--gcc/testsuite/g++.dg/abi/mangle-union1.C10
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_" } }