2007-01-09 17:59:20 +00:00
# Copyright 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
2009-01-03 05:58:08 +00:00
# 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
1999-04-16 01:35:26 +00:00
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
2007-08-23 18:14:19 +00:00
# the Free Software Foundation; either version 3 of the License, or
1999-04-16 01:35:26 +00:00
# (at your option) any later version.
2007-08-23 18:14:19 +00:00
#
1999-04-16 01:35:26 +00:00
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
2007-08-23 18:14:19 +00:00
#
1999-04-16 01:35:26 +00:00
# You should have received a copy of the GNU General Public License
2007-08-23 18:14:19 +00:00
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1999-04-16 01:35:26 +00:00
# This file was written by Fred Fish. (fnf@cygnus.com)
2003-12-31 20:59:11 +00:00
# And rewritten by Michael Chastain <mec.gnu@mindspring.com>.
1999-04-16 01:35:26 +00:00
set nl "\[\r\n\]+"
if $tracelevel then {
2003-12-31 20:59:11 +00:00
strace $tracelevel
1999-04-16 01:35:26 +00:00
}
1999-09-09 00:02:17 +00:00
if { [skip_cplus_tests] } { continue }
1999-04-16 01:35:26 +00:00
2004-08-12 18:51:41 +00:00
load_lib "cp-support.exp"
2004-03-09 17:11:55 +00:00
set testfile "classes"
1999-04-16 01:35:26 +00:00
set srcfile ${testfile}.cc
set binfile ${objdir}/${subdir}/${testfile}
if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
2006-08-10 05:27:22 +00:00
untested classes.exp
return -1
1999-04-16 01:35:26 +00:00
}
# Test ptype of class objects.
proc test_ptype_class_objects {} {
2003-12-31 20:59:11 +00:00
# Simple type.
1999-04-16 01:35:26 +00:00
2004-08-12 18:51:41 +00:00
cp_test_ptype_class \
"ptype struct default_public_struct" "" "struct" "default_public_struct" \
{
{ field public "int a;" }
{ field public "int b;" }
1999-04-16 01:35:26 +00:00
}
2004-08-12 18:51:41 +00:00
# Another simple type.
1999-04-16 01:35:26 +00:00
2004-08-12 18:51:41 +00:00
cp_test_ptype_class \
"ptype struct explicit_public_struct" "" "struct" "explicit_public_struct" \
{
{ field public "int a;" }
{ field public "int b;" }
1999-04-16 01:35:26 +00:00
}
2004-08-12 18:51:41 +00:00
# Another simple type.
2004-07-31 07:45:35 +00:00
2004-08-12 18:51:41 +00:00
cp_test_ptype_class \
"ptype struct protected_struct" "" "struct" "protected_struct" \
{
{ field protected "int a;" }
{ field protected "int b;" }
1999-04-16 01:35:26 +00:00
}
2004-08-12 18:51:41 +00:00
# Another simple type.
2004-07-31 07:45:35 +00:00
2004-08-12 18:51:41 +00:00
cp_test_ptype_class \
"ptype struct private_struct" "" "struct" "private_struct" \
{
{ field private "int a;" }
{ field private "int b;" }
1999-04-16 01:35:26 +00:00
}
2004-08-12 18:51:41 +00:00
# A bigger type.
2004-07-31 07:45:35 +00:00
2004-08-12 18:51:41 +00:00
cp_test_ptype_class \
"ptype struct mixed_protection_struct" "" "struct" "mixed_protection_struct" \
{
{ field public "int a;" }
{ field public "int b;" }
{ field private "int c;" }
{ field private "int d;" }
{ field protected "int e;" }
{ field protected "int f;" }
{ field public "int g;" }
{ field private "int h;" }
{ field protected "int i;" }
1999-04-16 01:35:26 +00:00
}
2003-12-31 20:59:11 +00:00
# All that again with "class" instead of "struct".
# gdb does not care about the difference anyways.
1999-04-16 01:35:26 +00:00
2004-08-12 18:51:41 +00:00
cp_test_ptype_class \
"ptype class public_class" "" "class" "public_class" \
{
{ field public "int a;" }
{ field public "int b;" }
1999-04-16 01:35:26 +00:00
}
2003-12-31 20:59:11 +00:00
2004-08-12 18:51:41 +00:00
# Another simple type.
2004-07-31 07:45:35 +00:00
2004-08-12 18:51:41 +00:00
cp_test_ptype_class \
"ptype class protected_class" "" "class" "protected_class" \
{
{ field protected "int a;" }
{ field protected "int b;" }
1999-04-16 01:35:26 +00:00
}
2004-08-12 18:51:41 +00:00
# Another simple type.
2004-07-31 07:45:35 +00:00
2004-08-12 18:51:41 +00:00
cp_test_ptype_class \
"ptype class default_private_class" "" "class" "default_private_class" \
{
{ field private "int a;" }
{ field private "int b;" }
1999-04-16 01:35:26 +00:00
}
2003-12-31 20:59:11 +00:00
2004-08-12 18:51:41 +00:00
# Another simple type.
2004-07-31 07:45:35 +00:00
2004-08-12 18:51:41 +00:00
cp_test_ptype_class \
"ptype class explicit_private_class" "" "class" "explicit_private_class" \
{
{ field private "int a;" }
{ field private "int b;" }
1999-04-16 01:35:26 +00:00
}
2004-08-12 18:51:41 +00:00
# A bigger type.
2003-12-31 20:59:11 +00:00
2004-08-12 18:51:41 +00:00
cp_test_ptype_class \
"ptype class mixed_protection_class" "" "class" "mixed_protection_class" \
{
2004-07-31 07:45:35 +00:00
2004-08-12 18:51:41 +00:00
{ field public "int a;" }
{ field public "int b;" }
{ field private "int c;" }
{ field private "int d;" }
{ field protected "int e;" }
{ field protected "int f;" }
{ field public "int g;" }
{ field private "int h;" }
{ field protected "int i;" }
1999-04-16 01:35:26 +00:00
}
2003-12-31 20:59:11 +00:00
# Here are some classes with inheritance.
# Base class.
2004-08-12 18:51:41 +00:00
cp_test_ptype_class \
"ptype class A" "" "class" "A" \
{
{ field public "int a;" }
{ field public "int x;" }
1999-04-16 01:35:26 +00:00
}
2003-12-31 20:59:11 +00:00
# Derived class.
2004-08-12 18:51:41 +00:00
cp_test_ptype_class \
"ptype class B" "" "class" "B" \
{
{ base "public A" }
{ field public "int b;" }
{ field public "int x;" }
1999-04-16 01:35:26 +00:00
}
2003-12-31 20:59:11 +00:00
# Derived class.
2004-08-12 18:51:41 +00:00
cp_test_ptype_class \
"ptype class C" "" "class" "C" \
{
{ base "public A" }
{ field public "int c;" }
{ field public "int x;" }
1999-04-16 01:35:26 +00:00
}
2003-12-31 20:59:11 +00:00
# Derived class, multiple inheritance.
2004-08-12 18:51:41 +00:00
cp_test_ptype_class \
"ptype class D" "" "class" "D" \
{
{ base "public B" }
{ base "public C" }
{ field public "int d;" }
{ field public "int x;" }
1999-04-16 01:35:26 +00:00
}
2003-12-31 20:59:11 +00:00
# Derived class.
2004-08-12 18:51:41 +00:00
cp_test_ptype_class \
"ptype class E" "" "class" "E" \
{
{ base "public D" }
{ field public "int e;" }
{ field public "int x;" }
1999-04-16 01:35:26 +00:00
}
2003-12-31 20:59:11 +00:00
# This is a break from inheritance tests.
#
# gcc 2.X with stabs (stabs or stabs+?) used to have a problem with
# static methods whose name is the same as their argument mangling.
2004-08-12 18:51:41 +00:00
cp_test_ptype_class \
"ptype class Static" "" "class" "Static" \
{
{ method public "static void ii(int, int);" }
2002-01-20 19:22:13 +00:00
}
2001-12-07 21:58:19 +00:00
2003-12-31 20:59:11 +00:00
# Here are some virtual inheritance tests.
2004-08-12 18:51:41 +00:00
# A virtual base class.
2004-07-31 07:45:35 +00:00
2004-08-12 18:51:41 +00:00
cp_test_ptype_class \
"ptype class vA" "" "class" "vA" \
{
{ field public "int va;" }
{ field public "int vx;" }
1999-04-16 01:35:26 +00:00
}
2004-08-12 18:51:41 +00:00
# A derived class with a virtual base.
2004-07-31 07:45:35 +00:00
2004-08-12 18:51:41 +00:00
cp_test_ptype_class \
"ptype class vB" "" "class" "vB" \
{
{ base "public virtual vA" }
{ vbase "vA" }
{ field public "int vb;" }
{ field public "int vx;" }
2004-07-31 07:45:35 +00:00
}
1999-04-16 01:35:26 +00:00
2004-08-12 18:51:41 +00:00
# Another derived class with a virtual base.
1999-04-16 01:35:26 +00:00
2004-08-12 18:51:41 +00:00
cp_test_ptype_class \
"ptype class vC" "" "class" "vC" \
{
{ base "public virtual vA" }
{ vbase "vA" }
{ field public "int vc;" }
{ field public "int vx;" }
1999-04-16 01:35:26 +00:00
}
2004-08-12 18:51:41 +00:00
# A classic diamond class.
2004-07-31 07:45:35 +00:00
2004-08-12 18:51:41 +00:00
cp_test_ptype_class \
"ptype class vD" "" "class" "vD" \
{
{ base "public virtual vB" }
{ base "public virtual vC" }
{ vbase "vC" }
{ vbase "vB" }
{ field public "int vd;" }
{ field public "int vx;" }
1999-04-16 01:35:26 +00:00
}
2004-08-12 18:51:41 +00:00
# A class derived from a diamond class.
1999-04-16 01:35:26 +00:00
2004-08-12 18:51:41 +00:00
cp_test_ptype_class \
"ptype class vE" "" "class" "vE" \
{
{ base "public virtual vD" }
{ vbase "vD" }
{ field public "int ve;" }
{ field public "int vx;" }
2001-12-07 22:02:23 +00:00
}
1999-04-16 01:35:26 +00:00
2003-12-31 20:59:11 +00:00
# Another inheritance series.
2004-08-12 18:51:41 +00:00
# A base class.
cp_test_ptype_class \
"ptype class Base1" "" "class" "Base1" \
{
{ field public "int x;" }
{ method public "Base1(int);" }
}
# Another base class.
cp_test_ptype_class \
"ptype class Foo" "" "class" "Foo" \
{
{ field public "int x;" }
{ field public "int y;" }
{ field public "static int st;" }
{ method public "Foo(int, int);" }
{ method public "int operator!();" }
{ method public "operator int();" }
{ method public "int times(int);" }
} \
"" \
{
{
"operator int();"
"int operator int();"
{ setup_kfail "gdb/1497" "*-*-*" }
}
{
"operator int();"
"int operator int(void);"
{ setup_kfail "gdb/1497" "*-*-*" }
}
2002-01-20 19:22:13 +00:00
}
1999-04-16 01:35:26 +00:00
2003-12-31 20:59:11 +00:00
# A multiple inheritance derived class.
2004-08-12 18:51:41 +00:00
cp_test_ptype_class \
"ptype class Bar" "" "class" "Bar" \
{
{ base "public Base1" }
{ base "public Foo" }
{ field public "int z;" }
{ method public "Bar(int, int, int);" }
1999-04-16 01:35:26 +00:00
}
2004-08-12 18:51:41 +00:00
1999-04-16 01:35:26 +00:00
}
# Test simple access to class members.
proc test_non_inherited_member_access {} {
# Print non-inherited members of g_A.
2004-08-13 08:48:46 +00:00
gdb_test "print g_A.a" ".* = 1"
gdb_test "print g_A.x" ".* = 2"
1999-04-16 01:35:26 +00:00
# Print non-inherited members of g_B.
2004-08-13 08:48:46 +00:00
gdb_test "print g_B.b" ".* = 5"
gdb_test "print g_B.x" ".* = 6"
1999-04-16 01:35:26 +00:00
# Print non-inherited members of g_C.
2004-08-13 08:48:46 +00:00
gdb_test "print g_C.c" ".* = 9"
gdb_test "print g_C.x" ".* = 10"
1999-04-16 01:35:26 +00:00
# Print non-inherited members of g_D.
2004-08-13 08:48:46 +00:00
gdb_test "print g_D.d" ".* = 19"
gdb_test "print g_D.x" ".* = 20"
1999-04-16 01:35:26 +00:00
# Print non-inherited members of g_E.
2004-08-13 08:48:46 +00:00
gdb_test "print g_E.e" ".* = 31"
gdb_test "print g_E.x" ".* = 32"
1999-04-16 01:35:26 +00:00
}
2003-12-31 20:59:11 +00:00
# Test access to members of other classes.
# gdb should refuse to print them.
# (I feel old -- I remember when this was legal in C -- chastain).
1999-04-16 01:35:26 +00:00
proc test_wrong_class_members {} {
2004-08-13 08:48:46 +00:00
gdb_test "print g_A.b" "There is no member( or method|) named b."
gdb_test "print g_B.c" "There is no member( or method|) named c."
gdb_test "print g_B.d" "There is no member( or method|) named d."
gdb_test "print g_C.b" "There is no member( or method|) named b."
gdb_test "print g_C.d" "There is no member( or method|) named d."
gdb_test "print g_D.e" "There is no member( or method|) named e."
1999-04-16 01:35:26 +00:00
}
2003-12-31 20:59:11 +00:00
# Test access to names that are not members of any class.
1999-04-16 01:35:26 +00:00
2000-07-09 05:10:13 +00:00
proc test_nonexistent_members {} {
2004-08-13 08:48:46 +00:00
gdb_test "print g_A.y" "There is no member( or method|) named y."
gdb_test "print g_B.z" "There is no member( or method|) named z."
gdb_test "print g_C.q" "There is no member( or method|) named q."
gdb_test "print g_D.p" "There is no member( or method|) named p."
1999-04-16 01:35:26 +00:00
}
2000-07-09 05:16:11 +00:00
# Call a method that expects a base class parameter with base, inherited,
# and unrelated class arguments.
proc test_method_param_class {} {
2004-08-13 08:48:46 +00:00
gdb_test "call class_param.Aptr_a (&g_A)" ".* = 1"
gdb_test "call class_param.Aptr_x (&g_A)" ".* = 2"
gdb_test "call class_param.Aptr_a (&g_B)" ".* = 3"
gdb_test "call class_param.Aptr_x (&g_B)" ".* = 4"
gdb_test "call class_param.Aref_a (g_A)" ".* = 1"
gdb_test "call class_param.Aref_x (g_A)" ".* = 2"
gdb_test "call class_param.Aref_a (g_B)" ".* = 3"
gdb_test "call class_param.Aref_x (g_B)" ".* = 4"
gdb_test "call class_param.Aval_a (g_A)" ".* = 1"
gdb_test "call class_param.Aval_x (g_A)" ".* = 2"
gdb_test "call class_param.Aval_a (g_B)" ".* = 3"
gdb_test "call class_param.Aval_x (g_B)" ".* = 4"
2000-07-09 05:16:11 +00:00
gdb_test "call class_param.Aptr_a (&foo)" "Cannot resolve .*" "unrelated class *param"
gdb_test "call class_param.Aref_a (foo)" "Cannot resolve .*" "unrelated class ¶m"
gdb_test "call class_param.Aval_a (foo)" "Cannot resolve .*" "unrelated class param"
}
2000-07-09 05:10:13 +00:00
# Examine a class with an enum field.
proc test_enums {} {
global gdb_prompt
2003-12-31 20:59:11 +00:00
global nl
2000-07-09 05:10:13 +00:00
# print the object
2008-08-21 18:57:34 +00:00
# We match the enum values with and without qualifiers. As of
# 2008-08-21 we can output the qualifiers for DWARF-2.
2003-12-31 20:59:11 +00:00
gdb_test "print obj_with_enum" \
2008-08-21 18:57:34 +00:00
"\\$\[0-9\]+ = \{priv_enum = (ClassWithEnum::)?red, x = 0\}" \
2003-12-31 20:59:11 +00:00
"print obj_with_enum (1)"
# advance one line
gdb_test "next" ""
2000-07-09 05:10:13 +00:00
# print the object again
2003-12-31 20:59:11 +00:00
gdb_test "print obj_with_enum" \
2008-08-21 18:57:34 +00:00
"\\$\[0-9\]+ = \{priv_enum = (ClassWithEnum::)?green, x = 0\}" \
2003-12-31 20:59:11 +00:00
"print obj_with_enum (2)"
# print the enum member
2008-08-21 18:57:34 +00:00
gdb_test "print obj_with_enum.priv_enum" "\\$\[0-9\]+ = (ClassWithEnum::)?green"
2000-07-09 05:10:13 +00:00
# ptype on the enum member
2003-12-31 20:59:11 +00:00
gdb_test_multiple "ptype obj_with_enum.priv_enum" "ptype obj_with_enum.priv_enum" {
2008-08-21 18:57:34 +00:00
-re "type = enum ClassWithEnum::PrivEnum \{ ?(ClassWithEnum::)?red, (ClassWithEnum::)?green, (ClassWithEnum::)?blue, (ClassWithEnum::)?yellow = 42 ?\}$nl$gdb_prompt $" {
2003-12-31 20:59:11 +00:00
pass "ptype obj_with_enum.priv_enum"
}
2008-08-21 18:57:34 +00:00
-re "type = enum PrivEnum \{ ?(ClassWithEnum::)?red, (ClassWithEnum::)?green, (ClassWithEnum::)?blue, (ClassWithEnum::)?yellow = 42 ?\}$nl$gdb_prompt $" {
2003-12-31 20:59:11 +00:00
# gcc 2.95.3 -gdwarf-2
# gcc 3.3.2 -gdwarf-2
pass "ptype obj_with_enum.priv_enum"
}
-re "type = enum \{ ?red, green, blue, yellow = 42 ?\}$nl$gdb_prompt $" {
# This case case is a little dubious, but it's not clear what
# ought to be required of a ptype on a private enum...
# -sts 19990324
#
# It bugs me that this happens with gcc 3.
# -- chastain 2003-12-30
#
# gcc 2.95.3 -gstabs+
# gcc 3.3.2 -gstabs+
# gcc HEAD 2003-12-28 21:08:30 UTC -gstabs+
pass "ptype obj_with_enum.priv_enum"
}
2000-07-09 05:10:13 +00:00
}
# ptype on the object
2004-07-31 07:45:35 +00:00
2004-08-12 18:51:41 +00:00
# NOTE: carlton/2003-02-28: One could certainly argue that plain
# "PrivEnum"
# is acceptable: PrivEnum is a member of ClassWithEnum, so
# there's no need to explicitly qualify its name with
# "ClassWithEnum::". The truth, though, is that GDB is simply
# forgetting that PrivEnum is a member of ClassWithEnum, so we do
# that output for a bad reason instead of a good reason. Under
# stabs, we probably can't get this right; under DWARF-2, we can.
cp_test_ptype_class \
"ptype obj_with_enum" "" "class" "ClassWithEnum" \
{
{ field public "ClassWithEnum::PrivEnum priv_enum;" }
{ field public "int x;" }
} \
"" \
{
{
"ClassWithEnum::PrivEnum priv_enum;"
"PrivEnum priv_enum;"
{ setup_kfail "gdb/57" "*-*-*" }
}
2003-12-31 20:59:11 +00:00
}
2000-07-09 05:10:13 +00:00
2003-12-31 20:59:11 +00:00
# I'll do this test two different ways, because of a parser bug.
2004-03-17 20:11:22 +00:00
# See PR gdb/1588.
2003-03-03 18:48:31 +00:00
2003-12-31 20:59:11 +00:00
gdb_test_multiple "print (ClassWithEnum::PrivEnum) 42" "print (ClassWithEnum::PrivEnum) 42" {
2008-08-21 18:57:34 +00:00
-re "\\$\[0-9\]+ = (ClassWithEnum::)?yellow$nl$gdb_prompt $" {
2003-12-31 20:59:11 +00:00
pass "print (ClassWithEnum::PrivEnum) 42"
2003-09-08 02:00:11 +00:00
}
2003-12-31 20:59:11 +00:00
-re "A (parse|syntax) error in expression, near `42'.$nl$gdb_prompt $" {
# "parse error" is bison 1.35.
# "syntax error" is bison 1.875.
2004-03-17 20:11:22 +00:00
kfail "gdb/1588" "print (ClassWithEnum::PrivEnum) 42"
2003-09-08 02:00:11 +00:00
}
2000-07-09 05:10:13 +00:00
}
2003-03-03 18:48:31 +00:00
2003-12-31 20:59:11 +00:00
gdb_test_multiple "print ('ClassWithEnum::PrivEnum') 42" "print ('ClassWithEnum::PrivEnum') 42" {
2008-08-21 18:57:34 +00:00
-re "\\$\[0-9\]+ = (ClassWithEnum::)?yellow$nl$gdb_prompt $" {
2003-12-31 20:59:11 +00:00
# gcc 3.3.2 -gstabs+
# gcc HEAD 2003-12-28 21:08:30 UTC -gstabs+
pass "print ('ClassWithEnum::PrivEnum') 42"
}
-re "No symbol \"ClassWithEnum::PrivEnum\" in current context.$nl$gdb_prompt $" {
# gcc 2.95.3 -gdwarf-2
# gcc 3.3.2 -gdwarf-2
# gcc HEAD 2003-12-28 21:08:30 UTC -gdwarf-2
# gcc 2.95.3 -gstabs+
kfail "gdb/57" "print ('ClassWithEnum::PrivEnum') 42"
}
2003-03-03 18:48:31 +00:00
}
2000-07-09 05:10:13 +00:00
}
1999-04-16 01:35:26 +00:00
# Pointers to class members
proc test_pointers_to_class_members {} {
* NEWS: Mention pointer to member improvements.
* Makefile.in (gnu-v3-abi.o): Delete special rule.
(eval.o, gnu-v3-abi.o, ia64-tdep.o): Update.
* ada-valprint.c (ada_print_scalar): Update for new type codes.
* c-typeprint.c (c_print_type): Update for new type codes.
(c_type_print_varspec_prefix, c_type_print_varspec_suffix)
(c_type_print_base): Likewise.
(c_type_print_args): Rewrite.
* c-valprint.c (c_val_print): Update for new type codes. Remove
support for references to members. Treat methods like functions.
* cp-abi.c (cplus_print_method_ptr, cplus_method_ptr_size)
(cplus_make_method_ptr, cplus_method_ptr_to_value): New.
* cp-abi.h (cplus_print_method_ptr, cplus_method_ptr_size)
(cplus_make_method_ptr, cplus_method_ptr_to_value): New prototypes.
(struct cp_abi_ops): Add corresponding members.
* cp-valprint.c (cp_print_class_method): Delete.
(cp_find_class_member): New function.
(cp_print_class_member): Use it. Simplify support for bogus
member pointers.
* dwarf2read.c (quirk_gcc_member_function_pointer): Use
lookup_methodptr_type.
(read_tag_ptr_to_member_type): Likewise, and lookup_memberptr_type.
* eval.c (evaluate_subexp_standard): Implement EVAL_SKIP for
OP_SCOPE. Update call to value_aggregate_elt. Rewrite member
pointer support.
(evaluate_subexp_for_address): Handle OP_SCOPE explicitly. Handle
references returned by user defined operators.
* f-typeprint.c (f_print_type, f_type_print_varspec_prefix)
(f_type_print_varspec_suffix): Remove support for member pointers.
* gdbtypes.c (lookup_memberptr_type): Renamed from lookup_member_type
and adjusted.
(smash_to_memberptr_type): Likewise, from smash_to_member_type.
(lookup_methodptr_type): New.
(rank_one_type): Adjust for TYPE_CODE_MEMBERPTR.
(recursive_dump_type): Update for new types.
* gdbtypes.h (enum type_code): Replace TYPE_CODE_MEMBER with
TYPE_CODE_MEMBERPTR and TYPE_CODE_METHODPTR.
(lookup_memberptr_type, lookup_methodptr_type)
(smash_to_memberptr_type): New prototypes.
(smash_to_method_type): Formatting fix.
(lookup_member_type, smash_to_member_type): Delete prototypes.
* gnu-v3-abi.c (gnuv3_get_vtable, gnuv3_get_virtual_fn): New.
Do not rely on debug information for the vptr or the method's
enclosing type. Handle function descriptors for IA64.
(gnuv3_virtual_fn_field): Rewrite using the new functions.
(gnuv3_find_method_in, gnuv3_print_method_ptr)
(gnuv3_method_ptr_size, gnuv3_make_method_ptr)
(gnuv3_method_ptr_to_value): New.
(init_gnuv3_ops): Set new members of gnu_v3_abi_ops.
* hpread.c (hpread_type_lookup): Update for new types.
* infcall.c (value_arg_coerce): Likewise.
* m2-typeprint.c (m2_print_type): Remove explicit support
for member pointers.
* m2-valprint.c (m2_val_print): Likewise.
* p-typeprint.c (pascal_type_print_varspec_prefix)
(pascal_type_print_varspec_suffix, pascal_type_print_base): Likewise.
* p-valprint.c (pascal_val_print): Likewise.
(pascal_object_print_class_method, pascal_object_print_class_member):
Delete.
* p-lang.h (pascal_object_print_class_method)
(pascal_object_print_class_member): Delete prototypes.
* stabsread.c (read_type): Update for new types.
* typeprint.c (print_type_scalar): Likewise.
* valops.c (value_struct_elt_for_reference, value_namespace_elt)
(value_maybe_namespace_elt, value_aggregate_elt): Add want_address
argument. Construct a pointer to member if the address of a
function or data member is requested.
(value_cast_pointers): Don't modify the input value.
(value_cast): Adjust pointer to member handling for new types.
Allow null pointer to member constants. Don't modify the input
value.
(value_ind): Remove pointer to member check. Handle function
descriptors for function pointers.
(value_struct_elt, value_find_oload_method_list, check_field):
Remove pointer to member checks.
* value.c (unpack_long): Allow pointers to data members.
(value_from_longest): Allow member pointers.
* value.h (value_aggregate_elt): Add want_address.
* varobj.c (c_variable_editable): Remove check for members.
* gdbarch.sh: Add vtable_function_descriptors and vbit_in_delta.
* ia64-tdep.c (ia64_convert_from_func_ptr_addr): Handle descriptors
in virtual tables.
(ia64_gdbarch_init): Call set_gdbarch_vtable_function_descriptors.
* c-lang.h (cp_print_class_method): Delete prototype.
* arm-tdep.c (arm_gdbarch_init): Call set_gdbarch_vbit_in_delta.
* mips-tdep.c (mips_gdbarch_init): Likewise.
* gdbarch.c, gdbarch.h: Regenerated.
* gdb.cp/classes.exp (test_pointers_to_class_members): Update expected
output. Test the types of members and member pointers.
* gdb.cp/inherit.exp (test_print_mi_member_types): Remove KFAILs for
gdb/2092.
* gdb.cp/member-ptr.exp: Search for a comment instead of a
statement. Enable for GCC. Update expected output for some tests
and add new tests. Remove obsolete GCC KFAILs. Allow GCC's class
layout.
* gdb.cp/member-ptr.cc (Padding, Padding::vspacer, Base, Base::get_x)
(Base::vget_base, Left, Left::vget, Right, Right::vget, Diamond)
(Diamond::vget_base): New.
(main): Add new tests.
* gdb.cp/printmethod.exp: Update expected output for member functions.
* gdb.cp/virtfunc.exp (test_virtual_calls): Add a KFAIL for
print pEe->D::vg().
2007-01-03 18:05:45 +00:00
gdb_test "print Bar::z" "Cannot reference non-static field \"z\""
gdb_test "print &Foo::x" "\\$\[0-9\]+ = &Foo::x"
2003-12-31 20:59:11 +00:00
gdb_test "print (int)&Foo::x" "\\$\[0-9\]+ = 0"
gdb_test "print (int)&Bar::y == 2*sizeof(int)" "\\$\[0-9\]+ = true"
2004-01-02 04:46:45 +00:00
* NEWS: Mention pointer to member improvements.
* Makefile.in (gnu-v3-abi.o): Delete special rule.
(eval.o, gnu-v3-abi.o, ia64-tdep.o): Update.
* ada-valprint.c (ada_print_scalar): Update for new type codes.
* c-typeprint.c (c_print_type): Update for new type codes.
(c_type_print_varspec_prefix, c_type_print_varspec_suffix)
(c_type_print_base): Likewise.
(c_type_print_args): Rewrite.
* c-valprint.c (c_val_print): Update for new type codes. Remove
support for references to members. Treat methods like functions.
* cp-abi.c (cplus_print_method_ptr, cplus_method_ptr_size)
(cplus_make_method_ptr, cplus_method_ptr_to_value): New.
* cp-abi.h (cplus_print_method_ptr, cplus_method_ptr_size)
(cplus_make_method_ptr, cplus_method_ptr_to_value): New prototypes.
(struct cp_abi_ops): Add corresponding members.
* cp-valprint.c (cp_print_class_method): Delete.
(cp_find_class_member): New function.
(cp_print_class_member): Use it. Simplify support for bogus
member pointers.
* dwarf2read.c (quirk_gcc_member_function_pointer): Use
lookup_methodptr_type.
(read_tag_ptr_to_member_type): Likewise, and lookup_memberptr_type.
* eval.c (evaluate_subexp_standard): Implement EVAL_SKIP for
OP_SCOPE. Update call to value_aggregate_elt. Rewrite member
pointer support.
(evaluate_subexp_for_address): Handle OP_SCOPE explicitly. Handle
references returned by user defined operators.
* f-typeprint.c (f_print_type, f_type_print_varspec_prefix)
(f_type_print_varspec_suffix): Remove support for member pointers.
* gdbtypes.c (lookup_memberptr_type): Renamed from lookup_member_type
and adjusted.
(smash_to_memberptr_type): Likewise, from smash_to_member_type.
(lookup_methodptr_type): New.
(rank_one_type): Adjust for TYPE_CODE_MEMBERPTR.
(recursive_dump_type): Update for new types.
* gdbtypes.h (enum type_code): Replace TYPE_CODE_MEMBER with
TYPE_CODE_MEMBERPTR and TYPE_CODE_METHODPTR.
(lookup_memberptr_type, lookup_methodptr_type)
(smash_to_memberptr_type): New prototypes.
(smash_to_method_type): Formatting fix.
(lookup_member_type, smash_to_member_type): Delete prototypes.
* gnu-v3-abi.c (gnuv3_get_vtable, gnuv3_get_virtual_fn): New.
Do not rely on debug information for the vptr or the method's
enclosing type. Handle function descriptors for IA64.
(gnuv3_virtual_fn_field): Rewrite using the new functions.
(gnuv3_find_method_in, gnuv3_print_method_ptr)
(gnuv3_method_ptr_size, gnuv3_make_method_ptr)
(gnuv3_method_ptr_to_value): New.
(init_gnuv3_ops): Set new members of gnu_v3_abi_ops.
* hpread.c (hpread_type_lookup): Update for new types.
* infcall.c (value_arg_coerce): Likewise.
* m2-typeprint.c (m2_print_type): Remove explicit support
for member pointers.
* m2-valprint.c (m2_val_print): Likewise.
* p-typeprint.c (pascal_type_print_varspec_prefix)
(pascal_type_print_varspec_suffix, pascal_type_print_base): Likewise.
* p-valprint.c (pascal_val_print): Likewise.
(pascal_object_print_class_method, pascal_object_print_class_member):
Delete.
* p-lang.h (pascal_object_print_class_method)
(pascal_object_print_class_member): Delete prototypes.
* stabsread.c (read_type): Update for new types.
* typeprint.c (print_type_scalar): Likewise.
* valops.c (value_struct_elt_for_reference, value_namespace_elt)
(value_maybe_namespace_elt, value_aggregate_elt): Add want_address
argument. Construct a pointer to member if the address of a
function or data member is requested.
(value_cast_pointers): Don't modify the input value.
(value_cast): Adjust pointer to member handling for new types.
Allow null pointer to member constants. Don't modify the input
value.
(value_ind): Remove pointer to member check. Handle function
descriptors for function pointers.
(value_struct_elt, value_find_oload_method_list, check_field):
Remove pointer to member checks.
* value.c (unpack_long): Allow pointers to data members.
(value_from_longest): Allow member pointers.
* value.h (value_aggregate_elt): Add want_address.
* varobj.c (c_variable_editable): Remove check for members.
* gdbarch.sh: Add vtable_function_descriptors and vbit_in_delta.
* ia64-tdep.c (ia64_convert_from_func_ptr_addr): Handle descriptors
in virtual tables.
(ia64_gdbarch_init): Call set_gdbarch_vtable_function_descriptors.
* c-lang.h (cp_print_class_method): Delete prototype.
* arm-tdep.c (arm_gdbarch_init): Call set_gdbarch_vbit_in_delta.
* mips-tdep.c (mips_gdbarch_init): Likewise.
* gdbarch.c, gdbarch.h: Regenerated.
* gdb.cp/classes.exp (test_pointers_to_class_members): Update expected
output. Test the types of members and member pointers.
* gdb.cp/inherit.exp (test_print_mi_member_types): Remove KFAILs for
gdb/2092.
* gdb.cp/member-ptr.exp: Search for a comment instead of a
statement. Enable for GCC. Update expected output for some tests
and add new tests. Remove obsolete GCC KFAILs. Allow GCC's class
layout.
* gdb.cp/member-ptr.cc (Padding, Padding::vspacer, Base, Base::get_x)
(Base::vget_base, Left, Left::vget, Right, Right::vget, Diamond)
(Diamond::vget_base): New.
(main): Add new tests.
* gdb.cp/printmethod.exp: Update expected output for member functions.
* gdb.cp/virtfunc.exp (test_virtual_calls): Add a KFAIL for
print pEe->D::vg().
2007-01-03 18:05:45 +00:00
gdb_test "ptype Bar::z" "type = int"
gdb_test "ptype &Bar::z" "type = int Bar::\\*"
2004-01-02 04:46:45 +00:00
# TODO: this is a bogus test. It's looking at a variable that
# has not even been declared yet, so it's accessing random junk
# on the stack and comparing that it's NOT equal to a specific
# value. It's been like this since gdb 4.10 in 1993!
# -- chastain 2004-01-01
gdb_test "print (int)pmi == sizeof(int)" ".* = false"
1999-04-16 01:35:26 +00:00
}
# Test static members.
proc test_static_members {} {
global hex
2003-12-31 20:59:11 +00:00
gdb_test "print Foo::st" "\\$\[0-9\]+ = 100"
2004-01-02 04:46:45 +00:00
gdb_test "set foo.st = 200" "" ""
2003-12-31 20:59:11 +00:00
gdb_test "print bar.st" "\\$\[0-9\]+ = 200"
gdb_test "print &foo.st" "\\$\[0-9\]+ = \\(int ?\\*\\) $hex"
gdb_test "print &Bar::st" "\\$\[0-9\]+ = \\(int ?\\*\\) $hex"
gdb_test "print *\$" "\\$\[0-9\]+ = 200"
1999-04-16 01:35:26 +00:00
gdb_test "set print static-members off" ""
gdb_test "print csi" \
"{x = 10, y = 20}" \
"print csi without static members"
gdb_test "print cnsi" \
"{x = 30, y = 40}" \
"print cnsi without static members"
gdb_test "set print static-members on" ""
gdb_test "print csi" \
"{x = 10, y = 20, static null = {x = 0, y = 0, static null = <same as static member of an already seen type>}}" \
"print csi with static members"
gdb_test "print cnsi" \
"{x = 30, y = 40, static null = {x = 0, y = 0, static null = <same as static member of an already seen type>, static yy = {z = 5, static xx = {x = 1, y = 2, static null = <same as static member of an already seen type>, static yy = <same as static member of an already seen type>}}}, static yy = <same as static member of an already seen type>}" \
"print cnsi with static members"
}
proc do_tests {} {
global prms_id
global bug_id
global subdir
global objdir
global srcdir
global binfile
global gdb_prompt
2003-12-31 20:59:11 +00:00
global nl
1999-04-16 01:35:26 +00:00
set prms_id 0
set bug_id 0
# Start with a fresh gdb.
gdb_exit
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load $binfile
2003-12-31 20:59:11 +00:00
gdb_test "set language c++" "" ""
gdb_test "set width 0" "" ""
1999-04-16 01:35:26 +00:00
2003-12-31 20:59:11 +00:00
if ![runto_main ] then {
perror "couldn't run to breakpoint"
return
2000-07-09 05:10:13 +00:00
}
2003-12-31 20:59:11 +00:00
gdb_breakpoint inheritance2
gdb_test "continue" ".*Breakpoint .* inheritance2.*" ""
1999-04-16 01:35:26 +00:00
2003-12-31 20:59:11 +00:00
test_ptype_class_objects
test_non_inherited_member_access
test_wrong_class_members
test_nonexistent_members
test_method_param_class
1999-04-16 01:35:26 +00:00
2003-12-31 20:59:11 +00:00
gdb_breakpoint enums2
2004-01-02 04:46:45 +00:00
gdb_test "continue" ".*Breakpoint .* enums2.*" "continue to enums2(\\(\\)|)"
2007-10-02 14:57:46 +00:00
# Leave enums2. Make sure we reach the next line, in case there
# are any more instructions to finish the function call.
gdb_test_multiple "finish" "" {
-re "enums2 \\(\\);.*$gdb_prompt $" {
gdb_test "next" "" ""
}
-re "$gdb_prompt $" { }
}
2003-12-31 20:59:11 +00:00
test_enums
2004-01-02 04:46:45 +00:00
gdb_test "finish" "" ""
test_pointers_to_class_members
test_static_members
2003-12-31 20:59:11 +00:00
# Now some random tests that were just thrown in here.
gdb_breakpoint marker_reg1
gdb_test "continue" ".*Breakpoint .* marker_reg1.*" ""
gdb_test "finish" "Run till exit from.*" "finish from marker_reg1"
# This class is so small that an instance of it can fit in a register.
# When gdb tries to call a method, it gets embarrassed about taking
# the address of a register.
#
# TODO: I think that message should be a PASS, not an XFAIL.
# gdb prints an informative message and declines to do something
# impossible.
#
# The method call actually succeeds if the compiler allocates very
# small classes in memory instead of registers. So this test does
# not tell us anything interesting if the call succeeds.
#
# -- chastain 2003-12-31
gdb_test_multiple "print v.method ()" "calling method for small class" {
-re "\\$\[0-9\]+ = 82$nl$gdb_prompt $" {
# gcc 3.3.2 -gdwarf-2
# gcc HEAD 2003-12-28 21:08:30 UTC -gdwarf-2
# gcc 3.3.2 -gstabs+
# gcc HEAD 2003-12-28 21:08:30 UTC -gstabs+
pass "calling method for small class"
}
-re "Address requested for identifier \"v\" which is in register .*$nl$gdb_prompt $" {
# gcc 2.95.3 -gdwarf-2
# gcc 2.95.3 -gstabs+
setup_xfail "*-*-*" 2972
fail "calling method for small class"
1999-04-16 01:35:26 +00:00
}
}
}
do_tests