diff mbox

[v3,05/11,PR,gdb/14441] gdb: demangle: implement demangling for rvalue reference typenames

Message ID 1457147955-21871-6-git-send-email-artemiyv@acm.org
State New, archived
Headers

Commit Message

Artemiy Volkov March 5, 2016, 3:19 a.m. UTC 
  This patch fixes demangling of names containing rvalue reference typenames by
handling DEMANGLE_COMPONENT_RVALUE_REFERENCE demangle component.

gdb/ChangeLog:

2016-03-04  Artemiy Volkov  <artemiyv@acm.org>

    * cp-name-parser.y (ptr_operator): Handle the '&&' token in
    typename.
    * cp-support.c (replace_typedefs): Handle
    DEMANGLE_COMPONENT_RVALUE_REFERENCE.
    * python/py-type.c (typy_lookup_type): Likewise.
---
 gdb/cp-name-parser.y | 4 ++++
 gdb/cp-support.c     | 1 +
 gdb/python/py-type.c | 4 ++++
 3 files changed, 9 insertions(+)

Comments

Keith Seitz March 16, 2016, 10:25 p.m. UTC | #1 
On 03/04/2016 07:19 PM, Artemiy Volkov wrote:
> This patch fixes demangling of names containing rvalue reference typenames by
> handling DEMANGLE_COMPONENT_RVALUE_REFERENCE demangle component.
> 
> gdb/ChangeLog:
> 
> 2016-03-04  Artemiy Volkov  <artemiyv@acm.org>
> 
>     * cp-name-parser.y (ptr_operator): Handle the '&&' token in
>     typename.
>     * cp-support.c (replace_typedefs): Handle
>     DEMANGLE_COMPONENT_RVALUE_REFERENCE.
>     * python/py-type.c (typy_lookup_type): Likewise.
> ---
>  gdb/cp-name-parser.y | 4 ++++
>  gdb/cp-support.c     | 1 +
>  gdb/python/py-type.c | 4 ++++
>  3 files changed, 9 insertions(+)
> 

This all looks okay to me.

Keith
diff mbox

Patch

diff --git a/gdb/cp-name-parser.y b/gdb/cp-name-parser.y
index c6a5c34..33fdcea 100644
--- a/gdb/cp-name-parser.y
+++ b/gdb/cp-name-parser.y
@@ -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;
diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index df127c4..1dde382 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -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;
 
diff --git a/gdb/python/py-type.c b/gdb/python/py-type.c
index 6103a2b..4ec920e 100644
--- a/gdb/python/py-type.c
+++ b/gdb/python/py-type.c
@@ -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)
     {
@@ -829,6 +830,9 @@  typy_lookup_type (struct demangle_component *demangled,
 	    case DEMANGLE_COMPONENT_REFERENCE:
 	      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);
 	      break;