[v2,05/11,PR,gdb/14441] gdb: demangle: implement demangling for rvalue reference typenames
Commit Message
This patch fixes demangling of names containing rvalue reference typenames by
handling DEMANGLE_COMPONENT_RVALUE_REFERENCE demangle component.
./ChangeLog:
2016-01-19 Artemiy Volkov <artemiyv@acm.org>
* gdb/cp-name-parser.y: Handle the '&&' token in typename.
* gdb/cp-support.c (replace_typedefs): Handle
DEMANGLE_COMPONENT_RVALUE_REFERENCE.
* gdb/python/py-type.c (typy_lookup_type): Likewise.
---
gdb/cp-name-parser.y | 4 ++++
gdb/cp-support.c | 1 +
gdb/python/py-type.c | 6 +++++-
3 files changed, 10 insertions(+), 1 deletion(-)
Comments
All nits here, too.
On 01/19/2016 10:53 AM, Artemiy Volkov wrote:
> 2016-01-19 Artemiy Volkov <artemiyv@acm.org>
>
> * gdb/cp-name-parser.y: Handle the '&&' token in typename.
We normally put a production name in place of where one would normally
use a function name. In this case, "(ptr_operator)".
> @@ -827,7 +828,10 @@ typy_lookup_type (struct demangle_component *demangled,
> switch (demangled_type)
> {
> case DEMANGLE_COMPONENT_REFERENCE:
> - rtype = lookup_lvalue_reference_type (type);
> + rtype = lookup_lvalue_reference_type (type);
> + break;
> + case DEMANGLE_COMPONENT_RVALUE_REFERENCE:
> + rtype = lookup_rvalue_reference_type (type);
> break;
> case DEMANGLE_COMPONENT_POINTER:
> rtype = lookup_pointer_type (type);
Indentation?
Keith
@@ -769,6 +769,10 @@ ptr_operator : '*' qualifiers_opt
{ $$.comp = make_empty (DEMANGLE_COMPONENT_REFERENCE);
$$.comp->u.s_binary.left = $$.comp->u.s_binary.right = NULL;
$$.last = &d_left ($$.comp); }
+ | ANDAND
+ { $$.comp = make_empty (DEMANGLE_COMPONENT_RVALUE_REFERENCE);
+ $$.comp->u.s_binary.left = $$.comp->u.s_binary.right = NULL;
+ $$.last = &d_left ($$.comp); }
| nested_name '*' qualifiers_opt
{ $$.comp = make_empty (DEMANGLE_COMPONENT_PTRMEM_TYPE);
$$.comp->u.s_binary.left = $1.comp;
@@ -520,6 +520,7 @@ replace_typedefs (struct demangle_parse_info *info,
case DEMANGLE_COMPONENT_RESTRICT_THIS:
case DEMANGLE_COMPONENT_POINTER:
case DEMANGLE_COMPONENT_REFERENCE:
+ case DEMANGLE_COMPONENT_RVALUE_REFERENCE:
replace_typedefs (info, d_left (ret_comp), finder, data);
break;
@@ -811,6 +811,7 @@ typy_lookup_type (struct demangle_component *demangled,
if (demangled_type == DEMANGLE_COMPONENT_POINTER
|| demangled_type == DEMANGLE_COMPONENT_REFERENCE
+ || demangled_type == DEMANGLE_COMPONENT_RVALUE_REFERENCE
|| demangled_type == DEMANGLE_COMPONENT_CONST
|| demangled_type == DEMANGLE_COMPONENT_VOLATILE)
{
@@ -827,7 +828,10 @@ typy_lookup_type (struct demangle_component *demangled,
switch (demangled_type)
{
case DEMANGLE_COMPONENT_REFERENCE:
- rtype = lookup_lvalue_reference_type (type);
+ rtype = lookup_lvalue_reference_type (type);
+ break;
+ case DEMANGLE_COMPONENT_RVALUE_REFERENCE:
+ rtype = lookup_rvalue_reference_type (type);
break;
case DEMANGLE_COMPONENT_POINTER:
rtype = lookup_pointer_type (type);