This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
FYI: fix PR 9514
- From: Tom Tromey <tromey at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Tue, 19 Jun 2012 13:49:16 -0600
- Subject: FYI: fix PR 9514
I'm checking this in.
This PR has come up a couple of times before -- I originally wrote this
patch back in 2008, then there was some more discussion last year.
I've updated the patch and fixed the regressions Keith noticed the last
time around. I did this by adding some new productions from the C++
standard, to work around the parse problem he identified.
First thread:
http://sourceware.org/ml/gdb-patches/2008-08/msg00539.html
Most recent thread (but started in previous month):
http://sourceware.org/ml/gdb-patches/2011-10/msg00025.html
Built and regtested on x86-64 Fedora 16.
Tom
ChangeLog:
2012-06-19 Tom Tromey <tromey@redhat.com>
PR exp/9514:
* parser-defs.h (insert_type, insert_type_address_space): Declare.
(push_type_address_space): Remove.
* parse.c (insert_into_type_stack): New function.
(insert_type): Likewise.
(insert_type_address_space): Rename from push_type_address_space.
Insert tp_space_identifier.
* c-exp.y (ptr_operator): New production.
(abs_decl): Use ptr_operator.
(space_identifier): Call insert_type_address_space.
(ptype): Don't use const_or_volatile_or_space_identifier.
(const_or_volatile_noopt): Call insert_type.
(conversion_type_id, conversion_declarator): New productions.
(operator): Use conversion_type_id.
testsuite/ChangeLog:
2012-06-19 Tom Tromey <tromey@redhat.com>
* gdb.base/whatis.exp: Add tests.
Index: c-exp.y
===================================================================
RCS file: /cvs/src/src/gdb/c-exp.y,v
retrieving revision 1.91
diff -u -r1.91 c-exp.y
--- c-exp.y 18 Jun 2012 20:23:38 -0000 1.91
+++ c-exp.y 19 Jun 2012 19:40:57 -0000
@@ -172,9 +172,10 @@
/* %type <bval> block */
/* Fancy type parsing. */
-%type <voidval> func_mod direct_abs_decl abs_decl
+%type <voidval> func_mod direct_abs_decl abs_decl ptr_operator
%type <tval> ptype
%type <lval> array_mod
+%type <tval> conversion_type_id
%token <typed_val_int> INT
%token <typed_val_float> FLOAT
@@ -931,9 +932,7 @@
;
space_identifier : '@' NAME
- { push_type_address_space (copy_name ($2.stoken));
- push_type (tp_space_identifier);
- }
+ { insert_type_address_space (copy_name ($2.stoken)); }
;
const_or_volatile: const_or_volatile_noopt
@@ -952,14 +951,23 @@
|
;
-abs_decl: '*'
- { push_type (tp_pointer); $$ = 0; }
- | '*' abs_decl
- { push_type (tp_pointer); $$ = $2; }
+ptr_operator:
+ ptr_operator '*'
+ { insert_type (tp_pointer); }
+ const_or_volatile_or_space_identifier
+ { $$ = 0; }
+ | '*'
+ { insert_type (tp_pointer); }
+ const_or_volatile_or_space_identifier
+ { $$ = 0; }
| '&'
- { push_type (tp_reference); $$ = 0; }
- | '&' abs_decl
- { push_type (tp_reference); $$ = $2; }
+ { insert_type (tp_reference); $$ = 0; }
+ | '&' ptr_operator
+ { insert_type (tp_reference); $$ = 0; }
+ ;
+
+abs_decl: ptr_operator direct_abs_decl
+ | ptr_operator
| direct_abs_decl
;
@@ -1203,22 +1211,30 @@
;
ptype : typebase
- | ptype const_or_volatile_or_space_identifier abs_decl const_or_volatile_or_space_identifier
+ | ptype abs_decl
{ $$ = follow_types ($1); }
;
+conversion_type_id: typebase conversion_declarator
+ { $$ = follow_types ($1); }
+ ;
+
+conversion_declarator: /* Nothing. */
+ | ptr_operator conversion_declarator
+ ;
+
const_and_volatile: CONST_KEYWORD VOLATILE_KEYWORD
| VOLATILE_KEYWORD CONST_KEYWORD
;
const_or_volatile_noopt: const_and_volatile
- { push_type (tp_const);
- push_type (tp_volatile);
+ { insert_type (tp_const);
+ insert_type (tp_volatile);
}
| CONST_KEYWORD
- { push_type (tp_const); }
+ { insert_type (tp_const); }
| VOLATILE_KEYWORD
- { push_type (tp_volatile); }
+ { insert_type (tp_volatile); }
;
operator: OPERATOR NEW
@@ -1325,7 +1341,7 @@
{ $$ = operator_stoken ("()"); }
| OPERATOR '[' ']'
{ $$ = operator_stoken ("[]"); }
- | OPERATOR ptype
+ | OPERATOR conversion_type_id
{ char *name;
long length;
struct ui_file *buf = mem_fileopen ();
Index: parse.c
===================================================================
RCS file: /cvs/src/src/gdb/parse.c,v
retrieving revision 1.117
diff -u -r1.117 parse.c
--- parse.c 18 May 2012 21:02:49 -0000 1.117
+++ parse.c 19 Jun 2012 19:40:57 -0000
@@ -1367,6 +1367,49 @@
}
}
+/* A helper function for insert_type and insert_type_address_space.
+ This does work of expanding the type stack and inserting the new
+ element, ELEMENT, into the stack at location SLOT. */
+
+static void
+insert_into_type_stack (int slot, union type_stack_elt element)
+{
+ check_type_stack_depth ();
+
+ if (slot < type_stack_depth)
+ memmove (&type_stack[slot + 1], &type_stack[slot],
+ (type_stack_depth - slot) * sizeof (union type_stack_elt));
+ type_stack[slot] = element;
+ ++type_stack_depth;
+}
+
+/* Insert a new type, TP, at the bottom of the type stack. If TP is
+ tp_pointer or tp_reference, it is inserted at the bottom. If TP is
+ a qualifier, it is inserted at slot 1 (just above a previous
+ tp_pointer) if there is anything on the stack, or simply pushed if
+ the stack is empty. Other values for TP are invalid. */
+
+void
+insert_type (enum type_pieces tp)
+{
+ union type_stack_elt element;
+ int slot;
+
+ gdb_assert (tp == tp_pointer || tp == tp_reference
+ || tp == tp_const || tp == tp_volatile);
+
+ /* If there is anything on the stack (we know it will be a
+ tp_pointer), insert the qualifier above it. Otherwise, simply
+ push this on the top of the stack. */
+ if (type_stack_depth && (tp == tp_const || tp == tp_volatile))
+ slot = 1;
+ else
+ slot = 0;
+
+ element.piece = tp;
+ insert_into_type_stack (slot, element);
+}
+
void
push_type (enum type_pieces tp)
{
@@ -1381,10 +1424,32 @@
type_stack[type_stack_depth++].int_val = n;
}
+/* Insert a tp_space_identifier and the corresponding address space
+ value into the stack. STRING is the name of an address space, as
+ recognized by address_space_name_to_int. If the stack is empty,
+ the new elements are simply pushed. If the stack is not empty,
+ this function assumes that the first item on the stack is a
+ tp_pointer, and the new values are inserted above the first
+ item. */
+
void
-push_type_address_space (char *string)
+insert_type_address_space (char *string)
{
- push_type_int (address_space_name_to_int (parse_gdbarch, string));
+ union type_stack_elt element;
+ int slot;
+
+ /* If there is anything on the stack (we know it will be a
+ tp_pointer), insert the address space qualifier above it.
+ Otherwise, simply push this on the top of the stack. */
+ if (type_stack_depth)
+ slot = 1;
+ else
+ slot = 0;
+
+ element.piece = tp_space_identifier;
+ insert_into_type_stack (slot, element);
+ element.int_val = address_space_name_to_int (parse_gdbarch, string);
+ insert_into_type_stack (slot, element);
}
enum type_pieces
Index: parser-defs.h
===================================================================
RCS file: /cvs/src/src/gdb/parser-defs.h,v
retrieving revision 1.43
diff -u -r1.43 parser-defs.h
--- parser-defs.h 27 Apr 2012 20:47:55 -0000 1.43
+++ parser-defs.h 19 Jun 2012 19:40:57 -0000
@@ -192,11 +192,13 @@
extern char *copy_name (struct stoken);
+extern void insert_type (enum type_pieces);
+
extern void push_type (enum type_pieces);
extern void push_type_int (int);
-extern void push_type_address_space (char *);
+extern void insert_type_address_space (char *);
extern enum type_pieces pop_type (void);
Index: testsuite/gdb.base/whatis.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/whatis.exp,v
retrieving revision 1.18
diff -u -r1.18 whatis.exp
--- testsuite/gdb.base/whatis.exp 16 Jan 2012 16:21:45 -0000 1.18
+++ testsuite/gdb.base/whatis.exp 19 Jun 2012 19:40:59 -0000
@@ -465,3 +465,17 @@
gdb_test "whatis a_char_addr" \
"type = char_addr" \
"whatis applied to variable defined by typedef"
+
+# Regression tests for PR 9514.
+
+gdb_test "whatis void (**)()" \
+ "type = void \\(\\*\\*\\)\\(\\)" \
+ "whatis applied to pointer to pointer to function"
+
+gdb_test "whatis void (** const)()" \
+ "type = void \\(\\*\\* const\\)\\(\\)" \
+ "whatis applied to const pointer to pointer to function"
+
+gdb_test "whatis void (* const *)()" \
+ "type = void \\(\\* const \\*\\)\\(\\)" \
+ "whatis applied to pointer to const pointer to function"