FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gdb:

Browse source 
PR gdb/1158:
	* valops.c (value_struct_elt): Treat function-valued field as a
	static method.
gdb/testsuite:
	* gdb.base/callfuncs.c (struct struct_with_fnptr): New struct.
	(function_struct, function_struct_ptr): New globals.
	* gdb.base/callfuncs.exp (do_function_calls): Test calling via a
	function pointer in a struct.
This commit is contained in:
Tom Tromey 2008-07-27 02:00:04 +00:00
parent ccb3ac8a12
commit fa8de41e93
5 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gdb/ChangeLog
View file

@ -1,3 +1,9 @@
2008-07-26 Tom Tromey <tromey@redhat.com>
PR gdb/1158:
* valops.c (value_struct_elt): Treat function-valued field as a
static method.
2008-07-26 Tom Tromey <tromey@redhat.com>
PR gdb/1136:

7
gdb/testsuite/ChangeLog
View file

@ -1,3 +1,10 @@
2008-07-26 Tom Tromey <tromey@redhat.com>
* gdb.base/callfuncs.c (struct struct_with_fnptr): New struct.
(function_struct, function_struct_ptr): New globals.
* gdb.base/callfuncs.exp (do_function_calls): Test calling via a
function pointer in a struct.
2008-07-26 Tom Tromey <tromey@redhat.com>
* gdb.base/macscp.exp: Add test for macro lexing bug.

8
gdb/testsuite/gdb.base/callfuncs.c
View file

@ -490,6 +490,14 @@ int a, b;
return ((*func_arg1)(a, b));
}
struct struct_with_fnptr
{
int (*func) PARAMS((int));
};
struct struct_with_fnptr function_struct = { doubleit };
struct struct_with_fnptr *function_struct_ptr = &function_struct;
/* Gotta have a main to be able to generate a linked, runnable
executable, and also provide a useful place to set a breakpoint. */

3
gdb/testsuite/gdb.base/callfuncs.exp
View file

@ -190,6 +190,9 @@ proc do_function_calls {} {
gdb_test "p t_func_values(func_val2,func_val1)" " = 0"
gdb_test "p t_func_values(func_val1,func_val2)" " = 1"
gdb_test "p function_struct.func(5)" " = 10"
gdb_test "p function_struct_ptr->func(10)" " = 20"
# GDB currently screws up the passing of function parameters for
# ABIs that use function descriptors. Instead of passing the
# address of te function descriptor, GDB passes the address of the

4
gdb/valops.c
View file

@ -1819,6 +1819,10 @@ value_struct_elt (struct value **argp, struct value **args,
back. If it's not callable (i.e., a pointer to function),
gdb should give an error. */
v = search_struct_field (name, *argp, 0, t, 0);
/* If we found an ordinary field, then it is not a method call.
So, treat it as if it were a static member function. */
if (v && static_memfuncp)
*static_memfuncp = 1;
}
if (!v)