commit ce2c5e6a2a8435d780d8550f4cebb10bf27fd03f
author Christopher Ferris <cferris@google.com> Fri Jun 02 15:19:05 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 02 15:19:05 2017 +0000
tree cf8b24f0c134cc85eb127444262340277796e2ce
parent b4012f24e0905269277e84cc871b8424eb513fe0
parent 0162d451eef37f3dc0d6cafbceda6be8226d516b

Merge "Fix handling of _ZLXX." am: 9b537f24bd am: a11394356c am: 930e0c3ad4
am: 1109ce9b9f

Change-Id: I5eb6cafb02128a75152cc7dcfe818f90a43b0a4f

demangle/DemangleTest.cpp

diff --git a/demangle/DemangleTest.cpp b/demangle/DemangleTest.cpp
index 5e17362..f56a9be 100644
--- a/demangle/DemangleTest.cpp
+++ b/demangle/DemangleTest.cpp
@@ -196,6 +196,14 @@
   ASSERT_EQ("value(one, signed char)", demangler.Parse("_Z5value3onea"));
 }
 
+TEST(DemangleTest, FunctionStartsWithLPlusNumber) {
+  Demangler demangler;
+
+  ASSERT_EQ("value(char, int)", demangler.Parse("_ZL5valueci"));
+  ASSERT_EQ("abcdefjklmn(signed char)", demangler.Parse("_ZL11abcdefjklmna"));
+  ASSERT_EQ("value(one, signed char)", demangler.Parse("_ZL5value3onea"));
+}
+
 TEST(DemangleTest, StdTypes) {
   Demangler demangler;
 

demangle/Demangler.cpp

diff --git a/demangle/Demangler.cpp b/demangle/Demangler.cpp
index 1b7406d..c0a96aa 100644
--- a/demangle/Demangler.cpp
+++ b/demangle/Demangler.cpp
@@ -698,6 +698,8 @@
 
   if (std::isdigit(*name)) {
     name = GetStringFromLength(name, &function_name_);
+  } else if (*name == 'L' && std::isdigit(name[1])) {
+    name = GetStringFromLength(name + 1, &function_name_);
   } else {
     name = AppendOperatorString(name);
     function_name_ = cur_state_.str;