From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 30 May 2017 07:47:05 +0000 (+0200)
Subject: backport: re PR c++/78761 (C++14, compiler generate mangled name that can not be... 
X-Git-Tag: releases/gcc-5.5.0~280
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f5f91a2a0fe40cf3ae36f7005f27d1f361698d6;p=thirdparty%2Fgcc.git

backport: re PR c++/78761 (C++14, compiler generate mangled name that can not be demangled)

	Backported from mainline
	2016-12-13  Jakub Jelinek  <jakub@redhat.com>

	PR c++/78761
	* cp-demangle.c (cplus_demangle_type): Demangle Dc as decltype(auto).
	* testsuite/demangle-expected: Add test for decltype(auto).

From-SVN: r248631
---

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 9859ad344582..13b0853627b8 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,12 @@
+2017-05-30  Jakub Jelinek  <jakub@redhat.com>
+
+	Backported from mainline
+	2016-12-13  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/78761
+	* cp-demangle.c (cplus_demangle_type): Demangle Dc as decltype(auto).
+	* testsuite/demangle-expected: Add test for decltype(auto).
+
 2016-06-03  Release Manager
 
 	* GCC 5.4.0 released.
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index aef2e9b32924..75e09b44acef 100644
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -2519,7 +2519,11 @@ cplus_demangle_type (struct d_info *di)
 	  /* auto */
 	  ret = d_make_name (di, "auto", 4);
 	  break;
-	  
+	case 'c':
+	  /* decltype(auto) */
+	  ret = d_make_name (di, "decltype(auto)", 14);
+	  break;
+
 	case 'f':
 	  /* 32-bit decimal floating point */
 	  ret = d_make_builtin_type (di, &cplus_demangle_builtin_types[26]);
diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected
index 1d8b771579de..17cab61a205a 100644
--- a/libiberty/testsuite/demangle-expected
+++ b/libiberty/testsuite/demangle-expected
@@ -4085,6 +4085,9 @@ decltype (new auto({parm#1})) f<int>(int)
 _Z1fIiERDaRKT_S1_
 auto& f<int>(int const&, int)
 --format=gnu-v3
+_Z1gIiEDcRKT_S0_
+decltype(auto) g<int>(int const&, int)
+--format=gnu-v3
 _Z1gILi1EEvR1AIXT_EER1BIXscbT_EE
 void g<1>(A<1>&, B<static_cast<bool>(1)>&)
 --format=gnu-v3