libiberty: Demangling 'M' prefixes

[thirdparty/gcc.git] / libiberty / cp-demangle.c

diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index 303bfbf709e106b31f7b3b419e683180d32236d8..4beb4d257bb2d9cb2810ee3c221bc01b5bd402ef 100644 (file)
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -1609,12 +1609,10 @@ d_prefix (struct d_info *di, int substable)
        }
       else if (peek == 'M')
        {
-         /* Initializer scope for a lambda.  We don't need to represent
-            this; the normal code will just treat the variable as a type
-            scope, which gives appropriate output.  */
-         if (ret == NULL)
-           return NULL;
+         /* Initializer scope for a lambda.  We already added it as a
+            substitution candidate, don't do that again.  */
          d_advance (di, 1);
+         continue;
        }
       else
        {