OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add missing CHECK_TYPEDEF calls to recent vptr_{fieldno,basetype} cleanup. 

gdb/ChangeLog:

	* gdbtypes.c (internal_type_vptr_fieldno): Add missing call to
	CHECK_TYPEDEF.
	(set_type_vptr_fieldno): Ditto.
	(internal_type_vptr_basetype, set_type_vptr_basetype): Ditto.
	* gnu-v3-abi.c (gnuv3_dynamic_class): Ditto.

gdb/testsuite/ChangeLog:

	* gdb.cp/class2.cc (Dbase, D): New classes.
	(main): New local delta.
	* gdb.cp/class2.exp: Test printing delta.
	* gdb.cp/classes.cc (DynamicBase2, DynamicBar): New classes.
	(dynbar): New global.
	* gdb.cp/classes.exp (test_ptype_class_objects): Test ptype DynamicBar.
This commit is contained in:
Doug Evans 2015-02-26 17:31:29 -08:00
parent 330b17b30f
commit 0def5aaad6
8 changed files with 83 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ChangeLog
View File

@ -1,3 +1,11 @@
2015-02-26 Doug Evans <dje@google.com>
* gdbtypes.c (internal_type_vptr_fieldno): Add missing call to
CHECK_TYPEDEF.
(set_type_vptr_fieldno): Ditto.
(internal_type_vptr_basetype, set_type_vptr_basetype): Ditto.
* gnu-v3-abi.c (gnuv3_dynamic_class): Ditto.
2015-02-26 Pedro Alves <palves@redhat.com>
* auto-load.h (file_is_auto_load_safe): Add ATTRIBUTE_PRINTF.

4
gdb/gdbtypes.c
View File

@ -1636,6 +1636,7 @@ get_signed_type_minmax (struct type *type, LONGEST *min, LONGEST *max)
int
internal_type_vptr_fieldno (struct type *type)
{
CHECK_TYPEDEF (type);
gdb_assert (TYPE_CODE (type) == TYPE_CODE_STRUCT
|| TYPE_CODE (type) == TYPE_CODE_UNION);
if (!HAVE_CPLUS_STRUCT (type))
@ -1648,6 +1649,7 @@ internal_type_vptr_fieldno (struct type *type)
void
set_type_vptr_fieldno (struct type *type, int fieldno)
{
CHECK_TYPEDEF (type);
gdb_assert (TYPE_CODE (type) == TYPE_CODE_STRUCT
|| TYPE_CODE (type) == TYPE_CODE_UNION);
if (!HAVE_CPLUS_STRUCT (type))
@ -1661,6 +1663,7 @@ set_type_vptr_fieldno (struct type *type, int fieldno)
struct type *
internal_type_vptr_basetype (struct type *type)
{
CHECK_TYPEDEF (type);
gdb_assert (TYPE_CODE (type) == TYPE_CODE_STRUCT
|| TYPE_CODE (type) == TYPE_CODE_UNION);
gdb_assert (TYPE_SPECIFIC_FIELD (type) == TYPE_SPECIFIC_CPLUS_STUFF);
@ -1672,6 +1675,7 @@ internal_type_vptr_basetype (struct type *type)
void
set_type_vptr_basetype (struct type *type, struct type *basetype)
{
CHECK_TYPEDEF (type);
gdb_assert (TYPE_CODE (type) == TYPE_CODE_STRUCT
|| TYPE_CODE (type) == TYPE_CODE_UNION);
if (!HAVE_CPLUS_STRUCT (type))

1
gdb/gnu-v3-abi.c
View File

@ -202,6 +202,7 @@ gnuv3_dynamic_class (struct type *type)
{
int fieldnum, fieldelem;
CHECK_TYPEDEF (type);
gdb_assert (TYPE_CODE (type) == TYPE_CODE_STRUCT
|| TYPE_CODE (type) == TYPE_CODE_UNION);

9
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,12 @@
2015-02-26 Doug Evans <dje@google.com>
* gdb.cp/class2.cc (Dbase, D): New classes.
(main): New local delta.
* gdb.cp/class2.exp: Test printing delta.
* gdb.cp/classes.cc (DynamicBase2, DynamicBar): New classes.
(dynbar): New global.
* gdb.cp/classes.exp (test_ptype_class_objects): Test ptype DynamicBar.
2015-02-26 Jan Kratochvil <jan.kratochvil@redhat.com>
* gdb.compile/compile-ifunc.c: New file.

19
gdb/testsuite/gdb.cp/class2.cc
View File

@ -46,6 +46,23 @@ struct C : public B
A *c2;
};
/* Use a typedef for the baseclass, with a virtual method, to exercise
gnu-v3-abi.c:gnuv3_dynamic_class recursion. It's important that the
class itself have no name to make sure the typedef makes it through
to the recursive call. */
typedef class {
public:
/* This class has no members as gcc 4.9.x doesn't emit the debug info
for them. */
virtual int get () { return 42; }
} Dbase;
class D : public Dbase
{
public:
int d1;
};
// Stop the compiler from optimizing away data.
void refer (A *)
{
@ -65,12 +82,14 @@ int main (void)
A alpha, *aap, *abp, *acp;
B beta, *bbp;
C gamma;
D delta;
empty e;
A &aref (alpha);
alpha.a1 = 100;
beta.a1 = 200; beta.b1 = 201; beta.b2 = 202;
gamma.c1 = 0; gamma.c2 = (A *) ~0UL;
delta.d1 = 400;
aap = &alpha; refer (aap);
abp = &beta; refer (abp);

16
gdb/testsuite/gdb.cp/class2.exp
View File

@ -101,17 +101,31 @@ gdb_test "print * (B *) abp" \
"= {.*a1 = 200.*b1 = 201.*b2 = 202}" \
"print * (B *) abp at marker return 0"
# Print the "D" object.
gdb_test "print delta" \
"= {.*d1 = 400}" \
"print delta with \"print object\" off"
# Printing the value of an object containing no data fields:
gdb_test "p e" "= \{<No data fields>\}" "print object with no data fields"
# Printing NULL pointers with "set print object on"
# Printing NULL pointers with "set print object on".
gdb_test_no_output "set print object on"
gdb_test "p acp" "= \\(C \\*\\) ${hex}"
gdb_test "p acp->c1" "\\(A \\*\\) 0x0"
gdb_test "p acp->c2" "\\(A \\*\\) ${hex}f"
# Print the "D" object with "set print object on".
# There's no difference in output, but this exercises vtable lookup
# with a typedef'd baseclass.
gdb_test "print delta" \
"= {.*d1 = 400}" \
"print delta with \"print object\" on"
# Regression test for PR c++/15401.
# Check that the type printed is a reference.
gdb_test "p aref" " = \\(A \\&\\) .*"

18
gdb/testsuite/gdb.cp/classes.cc
View File

@ -434,6 +434,24 @@ Foo::operator int() { return x; }
ByAnyOtherName foo(10, 11);
Bar bar(20, 21, 22);
/* Use a typedef for the baseclass to exercise gnu-v3-abi.c:gnuv3_dynamic_class
recursion. It's important that the class itself have no name to make sure
the typedef makes it through to the recursive call. */
typedef class {
public:
int x;
virtual int get_x () { return x; }
} DynamicBase2;
class DynamicBar : public DynamicBase2
{
public:
DynamicBar (int i, int j) { x = i; y = j; }
int y;
};
DynamicBar dynbar (23, 24);
class ClassWithEnum {
public:
enum PrivEnum { red, green, blue, yellow = 42 };

9
gdb/testsuite/gdb.cp/classes.exp
View File

@ -307,6 +307,15 @@ proc test_ptype_class_objects {} {
{ method public "Bar(int, int, int);" }
}
# Derived class with typedef'd baseclass with virtual methods.
cp_test_ptype_class \
"class DynamicBar" "" "class" "DynamicBar" \
{
{ base "public DynamicBase2" }
{ field public "int y;" }
{ method public "DynamicBar(int, int);" }
}
}
# Test simple access to class members.