* mangle.c (write_type): Mangle decltype(auto).

From-SVN: r198150

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7e224ae2e0e5688357ed09acd20db73894e184f2..b4680c276eb2117d22137b9b5aef9eaa50b1c991 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-22  Jason Merrill  <jason@redhat.com>
+
+       * mangle.c (write_type): Mangle decltype(auto).
+
 2013-04-19  Jason Merrill  <jason@redhat.com>
 
        N3638 changes to return type deduction

diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c
index 83c3e628da04bcf95f38b147e12ced47013b861b..8da62b5e969e54e1da4fec0660487c96766e1401 100644 (file)
--- a/gcc/cp/mangle.c
+++ b/gcc/cp/mangle.c
@@ -2019,7 +2019,10 @@ write_type (tree type)
            case TEMPLATE_TYPE_PARM:
              if (is_auto (type))
                {
-                 write_identifier ("Da");
+                 if (AUTO_IS_DECLTYPE (type))
+                   write_identifier ("Dc");
+                 else
+                   write_identifier ("Da");
                  ++is_builtin_type;
                  break;
                }

diff --git a/gcc/testsuite/g++.dg/cpp1y/auto-mangle1.C b/gcc/testsuite/g++.dg/cpp1y/auto-mangle1.C
new file mode 100644 (file)
index 0000000..834cfc3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/auto-mangle1.C
@@ -0,0 +1,12 @@
+// Mangling for decltype(auto)
+// { dg-options "-std=c++1y" }
+
+void f();
+
+// { dg-final { scan-assembler "_Z2g1IiEDcv" } }
+template <class T> decltype(auto) g1() { return &f; }
+template decltype(auto) g1<int>();
+
+// { dg-final { scan-assembler "_Z2g2IiEDav" } }
+template <class T> auto g2() { return &f; }
+template auto g2<int>();