From: Paul Pluzhnikov <ppluzhnikov@google.com>
Date: Sat, 12 Oct 2013 00:31:18 +0000 (-0700)
Subject: cp-demangle.c (d_name): Demangle local-source-names.
X-Git-Tag: releases/gcc-4.9.0~3554
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea0882a0ab42b96102df1b0a7cae751022191c78;p=thirdparty%2Fgcc.git

cp-demangle.c (d_name): Demangle local-source-names.

2013-10-11  Paul Pluzhnikov  <ppluzhnikov@google.com>

	* cp-demangle.c (d_name): Demangle local-source-names.
	* testsuite/demangle-expected: New test.

From-SVN: r203476
---

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 89e108a8da6a..c37939ca8eac 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-11  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+	* cp-demangle.c (d_name): Demangle local-source-names.
+	* testsuite/demangle-expected: New test.
+
 2013-09-10  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR bootstrap/58386
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index 70f54389c892..03989821b44a 100644
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -1276,7 +1276,6 @@ d_name (struct d_info *di)
     case 'Z':
       return d_local_name (di);
 
-    case 'L':
     case 'U':
       return d_unqualified_name (di);
 
@@ -1323,6 +1322,7 @@ d_name (struct d_info *di)
 	return dc;
       }
 
+    case 'L':
     default:
       dc = d_unqualified_name (di);
       if (d_peek_char (di) == 'I')
diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected
index 1259e4a9f495..b0bfcbb63343 100644
--- a/libiberty/testsuite/demangle-expected
+++ b/libiberty/testsuite/demangle-expected
@@ -4291,3 +4291,6 @@ void m<void () &&>(void (A::*)() &&)
 --format=gnu-v3
 _Z1nIM1AKFvvREEvT_
 void n<void (A::*)() const &>(void (A::*)() const &)
+--format=gnu-v3
+_ZL1fIiEvv
+void f<int>()