Improvements to FastDemangler to correct parsing of <local-name> encodings for string literal and parameter/entity cases. Patch courtesy of slydiman.

llvm-svn: 223569

1 files changed, 4 insertions, 0 deletions

diff --git a/lldb/source/Core/FastDemangle.cpp b/lldb/source/Core/FastDemangle.cpp
index d696dbd4535..53e8972e804 100644
--- a/lldb/source/Core/FastDemangle.cpp
+++ b/lldb/source/Core/FastDemangle.cpp
@@ -2039,11 +2039,15 @@ private:
         switch (*m_read_ptr)
         {
             case 's':
+                ++m_read_ptr;
                 TryParseDiscriminator(); // Optional and ignored
                 WRITE("::string literal");
                 break;
             case 'd':
+                ++m_read_ptr;
                 TryParseNumber(); // Optional and ignored
+                if (!Parse('_'))
+                    return false;
                 WriteNamespaceSeparator();
                 if (!ParseName())
                     return false;