2016-01-01 04:33:14 +00:00
|
|
|
# Copyright 1992-2016 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)
|
2004-01-01 02:30:59 +00:00
|
|
|
# And rewritten by Michael Chastain <mec.gnu@mindspring.com>.
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-01-02 04:46:45 +00:00
|
|
|
set nl "\[\r\n\]+"
|
1999-04-16 01:35:26 +00:00
|
|
|
|
1999-09-09 00:02:17 +00:00
|
|
|
if { [skip_cplus_tests] } { continue }
|
|
|
|
|
2004-08-09 22:47:50 +00:00
|
|
|
load_lib "cp-support.exp"
|
|
|
|
|
* gdb.cp/abstract-origin.exp: Use standard_testfile.
* gdb.cp/ambiguous.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/annota2.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/annota3.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/anon-ns.exp: Use standard_testfile.
* gdb.cp/anon-struct.exp: Use standard_testfile.
* gdb.cp/anon-union.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/arg-reference.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/bool.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/breakpoint.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/bs15503.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/call-c.exp: Use standard_testfile, clean_restart,
standard_output_file.
* gdb.cp/casts.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/class2.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/classes.exp: Use standard_testfile, prepare_for_testing.
(test_static_members): Update.
* gdb.cp/cmpd-minsyms.exp: Use standard_testfile.
* gdb.cp/converts.exp: Use standard_testfile.
* gdb.cp/cp-relocate.exp: Use standard_testfile.
* gdb.cp/cpcompletion.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/cpexprs.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/cplabel.exp: Use standard_testfile.
* gdb.cp/cplusfuncs.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/ctti.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/derivation.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/destrprint.exp: Use standard_testfile.
* gdb.cp/dispcxx.exp: Use standard_testfile.
* gdb.cp/exception.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/expand-psymtabs-cxx.exp: Use standard_testfile.
* gdb.cp/extern-c.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/formatted-ref.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/fpointer.exp: Use standard_testfile.
* gdb.cp/gdb1355.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/gdb2384.exp: Use standard_testfile, clean_restart,
standard_output_file.
* gdb.cp/gdb2495.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/hang.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/infcall-dlopen.exp: Use standard_testfile,
standard_output_file.
* gdb.cp/inherit.exp: Use standard_testfile, prepare_for_testing.
(do_tests): Update.
* gdb.cp/koenig.exp: Use standard_testfile.
* gdb.cp/local.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/m-data.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/m-static.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/mb-ctor.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/mb-inline.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/mb-templates.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/member-ptr.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/meth-typedefs.exp: Use standard_testfile.
* gdb.cp/method.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/method2.exp: Use standard_testfile.
* gdb.cp/minsym-fallback.exp: Use standard_testfile,
standard_output_file.
* gdb.cp/misc.exp: Use standard_testfile, prepare_for_testing.
(do_tests): Update.
* gdb.cp/namespace-enum.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/namespace-nested-import.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/namespace.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/nextoverthrow.exp: Use standard_testfile.
* gdb.cp/no-dmgl-verbose.exp: Use standard_testfile.
* gdb.cp/nsdecl.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/nsimport.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/nsnested.exp: Use standard_testfile.
* gdb.cp/nsnoimports.exp: Use standard_testfile.
* gdb.cp/nsrecurs.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/nsstress.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/nsusing.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/operator.exp: Use standard_testfile.
* gdb.cp/oranking.exp: Use standard_testfile.
* gdb.cp/overload-const.exp: Use standard_testfile.
* gdb.cp/overload.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/ovldbreak.exp: Use standard_testfile.
* gdb.cp/ovsrch.exp: Use standard_testfile.
* gdb.cp/paren-type.exp: Use standard_testfile.
* gdb.cp/pass-by-ref.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/pr-1023.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/pr-1210.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/pr-574.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/pr10687.exp: Use standard_testfile, clean_restart.
* gdb.cp/pr10728.exp: Use standard_testfile,
standard_output_file.
* gdb.cp/pr12028.exp: Use standard_testfile.
* gdb.cp/pr9067.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/pr9167.exp: Use standard_testfile.
* gdb.cp/pr9631.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/printmethod.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/psmang.exp: Use standard_testfile, clean_restart.
* gdb.cp/psymtab-parameter.exp: Use standard_testfile.
* gdb.cp/ptype-cv-cp.exp: Use standard_testfile.
* gdb.cp/re-set-overloaded.exp: Use standard_testfile,
standard_output_file.
* gdb.cp/readnow-language.exp: Use standard_testfile.
* gdb.cp/ref-params.exp: Use standard_testfile, build_executable.
(gdb_start_again): Use clean_restart.
* gdb.cp/ref-types.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/rtti.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/shadow.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/smartp.exp: Use standard_testfile.
* gdb.cp/static-method.exp: Use standard_testfile.
* gdb.cp/static-print-quit.exp: Use standard_testfile.
* gdb.cp/temargs.exp: Use standard_testfile.
* gdb.cp/templates.exp: Use standard_testfile,
prepare_for_testing.
(do_tests): Update.
* gdb.cp/try_catch.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/typedef-operator.exp: Use standard_testfile.
* gdb.cp/userdef.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/virtbase.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/virtfunc.exp: Use standard_testfile,
prepare_for_testing.
(do_tests): Update.
* gdb.cp/virtfunc2.exp: Use standard_testfile,
prepare_for_testing.
2012-07-10 15:18:18 +00:00
|
|
|
standard_testfile .cc
|
1999-04-16 01:35:26 +00:00
|
|
|
|
* gdb.cp/abstract-origin.exp: Use standard_testfile.
* gdb.cp/ambiguous.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/annota2.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/annota3.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/anon-ns.exp: Use standard_testfile.
* gdb.cp/anon-struct.exp: Use standard_testfile.
* gdb.cp/anon-union.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/arg-reference.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/bool.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/breakpoint.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/bs15503.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/call-c.exp: Use standard_testfile, clean_restart,
standard_output_file.
* gdb.cp/casts.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/class2.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/classes.exp: Use standard_testfile, prepare_for_testing.
(test_static_members): Update.
* gdb.cp/cmpd-minsyms.exp: Use standard_testfile.
* gdb.cp/converts.exp: Use standard_testfile.
* gdb.cp/cp-relocate.exp: Use standard_testfile.
* gdb.cp/cpcompletion.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/cpexprs.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/cplabel.exp: Use standard_testfile.
* gdb.cp/cplusfuncs.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/ctti.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/derivation.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/destrprint.exp: Use standard_testfile.
* gdb.cp/dispcxx.exp: Use standard_testfile.
* gdb.cp/exception.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/expand-psymtabs-cxx.exp: Use standard_testfile.
* gdb.cp/extern-c.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/formatted-ref.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/fpointer.exp: Use standard_testfile.
* gdb.cp/gdb1355.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/gdb2384.exp: Use standard_testfile, clean_restart,
standard_output_file.
* gdb.cp/gdb2495.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/hang.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/infcall-dlopen.exp: Use standard_testfile,
standard_output_file.
* gdb.cp/inherit.exp: Use standard_testfile, prepare_for_testing.
(do_tests): Update.
* gdb.cp/koenig.exp: Use standard_testfile.
* gdb.cp/local.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/m-data.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/m-static.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/mb-ctor.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/mb-inline.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/mb-templates.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/member-ptr.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/meth-typedefs.exp: Use standard_testfile.
* gdb.cp/method.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/method2.exp: Use standard_testfile.
* gdb.cp/minsym-fallback.exp: Use standard_testfile,
standard_output_file.
* gdb.cp/misc.exp: Use standard_testfile, prepare_for_testing.
(do_tests): Update.
* gdb.cp/namespace-enum.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/namespace-nested-import.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/namespace.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/nextoverthrow.exp: Use standard_testfile.
* gdb.cp/no-dmgl-verbose.exp: Use standard_testfile.
* gdb.cp/nsdecl.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/nsimport.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/nsnested.exp: Use standard_testfile.
* gdb.cp/nsnoimports.exp: Use standard_testfile.
* gdb.cp/nsrecurs.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/nsstress.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/nsusing.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/operator.exp: Use standard_testfile.
* gdb.cp/oranking.exp: Use standard_testfile.
* gdb.cp/overload-const.exp: Use standard_testfile.
* gdb.cp/overload.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/ovldbreak.exp: Use standard_testfile.
* gdb.cp/ovsrch.exp: Use standard_testfile.
* gdb.cp/paren-type.exp: Use standard_testfile.
* gdb.cp/pass-by-ref.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/pr-1023.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/pr-1210.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/pr-574.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/pr10687.exp: Use standard_testfile, clean_restart.
* gdb.cp/pr10728.exp: Use standard_testfile,
standard_output_file.
* gdb.cp/pr12028.exp: Use standard_testfile.
* gdb.cp/pr9067.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/pr9167.exp: Use standard_testfile.
* gdb.cp/pr9631.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/printmethod.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/psmang.exp: Use standard_testfile, clean_restart.
* gdb.cp/psymtab-parameter.exp: Use standard_testfile.
* gdb.cp/ptype-cv-cp.exp: Use standard_testfile.
* gdb.cp/re-set-overloaded.exp: Use standard_testfile,
standard_output_file.
* gdb.cp/readnow-language.exp: Use standard_testfile.
* gdb.cp/ref-params.exp: Use standard_testfile, build_executable.
(gdb_start_again): Use clean_restart.
* gdb.cp/ref-types.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/rtti.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/shadow.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/smartp.exp: Use standard_testfile.
* gdb.cp/static-method.exp: Use standard_testfile.
* gdb.cp/static-print-quit.exp: Use standard_testfile.
* gdb.cp/temargs.exp: Use standard_testfile.
* gdb.cp/templates.exp: Use standard_testfile,
prepare_for_testing.
(do_tests): Update.
* gdb.cp/try_catch.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/typedef-operator.exp: Use standard_testfile.
* gdb.cp/userdef.exp: Use standard_testfile, prepare_for_testing.
* gdb.cp/virtbase.exp: Use standard_testfile,
prepare_for_testing.
* gdb.cp/virtfunc.exp: Use standard_testfile,
prepare_for_testing.
(do_tests): Update.
* gdb.cp/virtfunc2.exp: Use standard_testfile,
prepare_for_testing.
2012-07-10 15:18:18 +00:00
|
|
|
if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
|
|
|
|
return -1
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
2004-01-02 04:46:45 +00:00
|
|
|
proc test_ptype_of_classes {} {
|
2004-01-01 02:30:59 +00:00
|
|
|
|
2004-01-02 04:46:45 +00:00
|
|
|
# class VA
|
2004-01-01 02:30:59 +00:00
|
|
|
|
2004-08-09 22:47:50 +00:00
|
|
|
cp_test_ptype_class \
|
2012-11-12 17:08:09 +00:00
|
|
|
"VA" "" "class" "VA" \
|
2004-08-09 22:47:50 +00:00
|
|
|
{
|
|
|
|
{ field public "int va;" }
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-01-02 04:46:45 +00:00
|
|
|
# class VB
|
1999-12-07 03:56:43 +00:00
|
|
|
|
2004-08-09 22:47:50 +00:00
|
|
|
cp_test_ptype_class \
|
2012-11-12 17:08:09 +00:00
|
|
|
"VB" "" "class" "VB" \
|
2004-08-09 22:47:50 +00:00
|
|
|
{
|
|
|
|
{ field public "int vb;" }
|
|
|
|
{ method public "int fvb();" }
|
|
|
|
{ method public "virtual int vvb();" }
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-01-01 02:30:59 +00:00
|
|
|
# class V
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-08-09 22:47:50 +00:00
|
|
|
cp_test_ptype_class \
|
2012-11-12 17:08:09 +00:00
|
|
|
"V" "" "class" "V" \
|
2004-08-09 22:47:50 +00:00
|
|
|
{
|
|
|
|
{ base "public VA" }
|
|
|
|
{ base "public VB" }
|
|
|
|
{ field public "int w;" }
|
|
|
|
{ method public "int f();" }
|
|
|
|
{ method public "virtual int vv();" }
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-01-02 04:46:45 +00:00
|
|
|
# class A
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-08-09 22:47:50 +00:00
|
|
|
cp_test_ptype_class \
|
2012-11-12 17:08:09 +00:00
|
|
|
"A" "" "class" "A" \
|
2004-08-09 22:47:50 +00:00
|
|
|
{
|
|
|
|
{ base "public virtual V" }
|
|
|
|
{ vbase "V" }
|
|
|
|
{ field private "int a;" }
|
|
|
|
{ method public "virtual int f();" }
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-01-02 04:46:45 +00:00
|
|
|
# class B
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-08-09 22:47:50 +00:00
|
|
|
cp_test_ptype_class \
|
2012-11-12 17:08:09 +00:00
|
|
|
"B" "" "class" "B" \
|
2004-08-09 22:47:50 +00:00
|
|
|
{
|
|
|
|
{ base "public A" }
|
|
|
|
{ field private "int b;" }
|
|
|
|
{ method public "virtual int f();" }
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-01-02 04:46:45 +00:00
|
|
|
# class C
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-08-09 22:47:50 +00:00
|
|
|
cp_test_ptype_class \
|
2012-11-12 17:08:09 +00:00
|
|
|
"C" "" "class" "C" \
|
2004-08-09 22:47:50 +00:00
|
|
|
{
|
|
|
|
{ base "public virtual V" }
|
|
|
|
{ vbase "V" }
|
|
|
|
{ field public "int c;" }
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-01-02 04:46:45 +00:00
|
|
|
# class AD
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-08-09 22:47:50 +00:00
|
|
|
cp_test_ptype_class \
|
2012-11-12 17:08:09 +00:00
|
|
|
"AD" "" "class" "AD" \
|
2004-08-09 22:47:50 +00:00
|
|
|
{
|
|
|
|
{ method public "virtual int vg();" }
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-01-02 04:46:45 +00:00
|
|
|
# class D
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-08-09 22:47:50 +00:00
|
|
|
cp_test_ptype_class \
|
2012-11-12 17:08:09 +00:00
|
|
|
"D" "" "class" "D" \
|
2004-08-09 22:47:50 +00:00
|
|
|
{
|
|
|
|
{ base "public AD" }
|
|
|
|
{ base "public virtual V" }
|
|
|
|
{ vbase "V" }
|
|
|
|
{ method public "static void s();" }
|
|
|
|
{ method public "virtual int vg();" }
|
|
|
|
{ method public "virtual int vd();" }
|
|
|
|
{ method public "int fd();" }
|
|
|
|
{ field public "int d;" }
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-01-02 04:46:45 +00:00
|
|
|
# class E
|
2004-01-01 02:30:59 +00:00
|
|
|
|
2004-08-09 22:47:50 +00:00
|
|
|
cp_test_ptype_class \
|
2012-11-12 17:08:09 +00:00
|
|
|
"E" "" "class" "E" \
|
2004-08-09 22:47:50 +00:00
|
|
|
{
|
|
|
|
{ base "public B" }
|
|
|
|
{ base "public virtual V" }
|
|
|
|
{ base "public D" }
|
|
|
|
{ base "public C" }
|
|
|
|
{ vbase "V" }
|
|
|
|
{ method public "virtual int f();" }
|
|
|
|
{ method public "virtual int vg();" }
|
|
|
|
{ method public "virtual int vv();" }
|
|
|
|
{ field public "int e;" }
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-01-02 04:46:45 +00:00
|
|
|
# An instance of D
|
2004-01-01 02:30:59 +00:00
|
|
|
|
2012-11-12 17:08:09 +00:00
|
|
|
cp_test_ptype_class "dd" "" "class" "D" ibid
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-01-02 04:46:45 +00:00
|
|
|
# An instance of D *
|
2004-01-01 02:30:59 +00:00
|
|
|
|
2012-11-12 17:08:09 +00:00
|
|
|
cp_test_ptype_class "ppd" "" "class" "D" ibid "*"
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-01-02 04:46:45 +00:00
|
|
|
# An instance of AD *
|
|
|
|
# TODO: this should be named pADd, not pAd.
|
2004-01-01 02:30:59 +00:00
|
|
|
|
2012-11-12 17:08:09 +00:00
|
|
|
cp_test_ptype_class "pAd" "" "class" "AD" ibid "*"
|
2004-08-09 22:47:50 +00:00
|
|
|
|
|
|
|
# Instances of these classes.
|
|
|
|
|
2012-11-12 17:08:09 +00:00
|
|
|
cp_test_ptype_class "a" "" "class" "A" ibid
|
|
|
|
cp_test_ptype_class "b" "" "class" "B" ibid
|
|
|
|
cp_test_ptype_class "c" "" "class" "C" ibid
|
|
|
|
cp_test_ptype_class "d" "" "class" "D" ibid
|
|
|
|
cp_test_ptype_class "e" "" "class" "E" ibid
|
|
|
|
cp_test_ptype_class "v" "" "class" "V" ibid
|
|
|
|
cp_test_ptype_class "vb" "" "class" "VB" ibid
|
2004-08-09 22:47:50 +00:00
|
|
|
|
|
|
|
# Instances of pointers to these classes.
|
|
|
|
|
2012-11-12 17:08:09 +00:00
|
|
|
cp_test_ptype_class "pAa" "" "class" "A" ibid "*"
|
|
|
|
cp_test_ptype_class "pAe" "" "class" "A" ibid "*"
|
|
|
|
cp_test_ptype_class "pBe" "" "class" "B" ibid "*"
|
|
|
|
cp_test_ptype_class "pDd" "" "class" "D" ibid "*"
|
|
|
|
cp_test_ptype_class "pDe" "" "class" "D" ibid "*"
|
|
|
|
cp_test_ptype_class "pVa" "" "class" "V" ibid "*"
|
|
|
|
cp_test_ptype_class "pVv" "" "class" "V" ibid "*"
|
|
|
|
cp_test_ptype_class "pVe" "" "class" "V" ibid "*"
|
|
|
|
cp_test_ptype_class "pVd" "" "class" "V" ibid "*"
|
|
|
|
cp_test_ptype_class "pADe" "" "class" "AD" ibid "*"
|
|
|
|
cp_test_ptype_class "pEe" "" "class" "E" ibid "*"
|
|
|
|
cp_test_ptype_class "pVB" "" "class" "VB" ibid "*"
|
2004-01-02 04:46:45 +00:00
|
|
|
|
2004-01-01 02:30:59 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-01-01 02:30:59 +00:00
|
|
|
# Call virtual functions.
|
|
|
|
|
|
|
|
proc test_virtual_calls {} {
|
|
|
|
global gdb_prompt
|
|
|
|
global nl
|
|
|
|
|
|
|
|
if [target_info exists gdb,cannot_call_functions] {
|
|
|
|
setup_xfail "*-*-*" 2416
|
|
|
|
fail "This target can not call functions"
|
|
|
|
return 0
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
2004-01-01 02:30:59 +00:00
|
|
|
gdb_test "print pAe->f()" "\\$\[0-9\]+ = 20"
|
|
|
|
gdb_test "print pAa->f()" "\\$\[0-9\]+ = 1"
|
|
|
|
gdb_test "print pDe->vg()" "\\$\[0-9\]+ = 202"
|
|
|
|
gdb_test "print pADe->vg()" "\\$\[0-9\]+ = 202"
|
|
|
|
gdb_test "print pDd->vg()" "\\$\[0-9\]+ = 101"
|
|
|
|
gdb_test "print pEe->vvb()" "\\$\[0-9\]+ = 411"
|
|
|
|
gdb_test "print pVB->vvb()" "\\$\[0-9\]+ = 407"
|
|
|
|
gdb_test "print pBe->vvb()" "\\$\[0-9\]+ = 411"
|
|
|
|
gdb_test "print pDe->vvb()" "\\$\[0-9\]+ = 411"
|
|
|
|
gdb_test "print pEe->vd()" "\\$\[0-9\]+ = 282"
|
|
|
|
gdb_test "print pEe->fvb()" "\\$\[0-9\]+ = 311"
|
|
|
|
|
|
|
|
# more recent results:
|
|
|
|
# wrong value "202"
|
|
|
|
# gcc 2.95.3 -gdwarf-2
|
|
|
|
# gcc 2.95.3 -gstabs+
|
|
|
|
# attempt to take addres of value not located in memory
|
|
|
|
# gcc 3.3.2 -gdwarf-2
|
|
|
|
# gcc 3.3.2 -gstabs+
|
|
|
|
#
|
|
|
|
# -- chastain 2003-12-31
|
|
|
|
|
|
|
|
gdb_test_multiple "print pEe->D::vg()" "print pEe->D::vg()" {
|
|
|
|
-re "\\$\[0-9]+ = 102$nl$gdb_prompt $" {
|
|
|
|
pass "print pEe->D::vg()"
|
|
|
|
}
|
* 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
|
|
|
-re "\\$\[0-9]+ = 202$nl$gdb_prompt $" {
|
|
|
|
# To get this result, we have called pEe->*(&D::vg) ().
|
|
|
|
# That's how GDB interprets this, but it's wrong; in fact
|
|
|
|
# the explicit D:: means to bypass virtual function lookup,
|
|
|
|
# and call D::vg as if it were non-virtual. We still have
|
|
|
|
# to e.g. adjust "this", though.
|
|
|
|
kfail "gdb/1064" "print pEe->D::vg()"
|
|
|
|
}
|
2004-01-01 02:30:59 +00:00
|
|
|
-re "Attempt to take address of value not located in memory.$nl$gdb_prompt $" {
|
|
|
|
kfail "gdb/1064" "print pEe->D::vg()"
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-15 15:43:18 +00:00
|
|
|
# A helper proc that creates a regular expression matching a
|
|
|
|
# particular vtable. NAME is the type name. Each element of ARGS is
|
|
|
|
# the name of a function in the vtable.
|
|
|
|
|
|
|
|
proc make_one_vtable_result {name args} {
|
|
|
|
global hex
|
|
|
|
|
|
|
|
set nls "\[\r\n\]+"
|
|
|
|
|
|
|
|
set result "vtable for '${name}' @ $hex .subobject @ $hex.:$nls"
|
|
|
|
set count 0
|
|
|
|
foreach func $args {
|
2013-06-05 20:38:37 +00:00
|
|
|
append result ".${count}.:( @$hex:)? $hex <(\.)?$func..>${nls}"
|
2012-03-15 15:43:18 +00:00
|
|
|
incr count
|
|
|
|
}
|
|
|
|
|
|
|
|
return $result
|
|
|
|
}
|
|
|
|
|
|
|
|
# Test "info vtbl".
|
|
|
|
|
|
|
|
proc test_info_vtbl {} {
|
|
|
|
global hex
|
|
|
|
|
|
|
|
set nls "\[\r\n\]+"
|
|
|
|
|
|
|
|
set vt_A [make_one_vtable_result A A::f]
|
|
|
|
set vt_B [make_one_vtable_result B B::f]
|
|
|
|
set vt_V [make_one_vtable_result V VB::vvb V::vv]
|
|
|
|
set vt_V2 [make_one_vtable_result V VB::vvb "virtual thunk to E::vv"]
|
|
|
|
set vt_D [make_one_vtable_result D D::vg D::vd]
|
|
|
|
set vt_D2 [make_one_vtable_result D "non-virtual thunk to E::vg" D::vd]
|
|
|
|
set vt_E [make_one_vtable_result E E::f E::vg E::vv]
|
|
|
|
|
|
|
|
gdb_test "info vtbl a" "${vt_A}${vt_V}"
|
|
|
|
gdb_test "info vtbl b" "${vt_B}${vt_V}"
|
|
|
|
gdb_test "info vtbl c" "${vt_V}"
|
|
|
|
gdb_test "info vtbl d" "${vt_D}${vt_V}"
|
|
|
|
gdb_test "info vtbl e" "${vt_E}${vt_D2}${vt_V2}"
|
|
|
|
gdb_test "info vtbl pEe" "${vt_E}${vt_D2}${vt_V2}"
|
|
|
|
|
|
|
|
gdb_test "info vtbl" "Argument required.*"
|
|
|
|
gdb_test "info vtbl va" \
|
|
|
|
"This object does not have a virtual function table.*"
|
|
|
|
gdb_test "info vtbl all_count" \
|
|
|
|
"This object does not have a virtual function table.*"
|
|
|
|
}
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
proc do_tests {} {
|
2010-06-03 23:54:18 +00:00
|
|
|
gdb_test_no_output "set language c++" ""
|
|
|
|
gdb_test_no_output "set width 0" ""
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2009-11-13 22:28:54 +00:00
|
|
|
if ![runto_main] then {
|
|
|
|
perror "couldn't run to breakpoint"
|
|
|
|
return
|
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
test_ptype_of_classes
|
2012-03-15 15:43:18 +00:00
|
|
|
test_info_vtbl
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-01-01 02:30:59 +00:00
|
|
|
gdb_breakpoint test_calls
|
|
|
|
gdb_test "continue" ".*Breakpoint .* test_calls.*" ""
|
|
|
|
test_virtual_calls
|
2007-05-07 11:49:05 +00:00
|
|
|
|
|
|
|
gdb_test "next" ".*pAa->f.*" "next to pAa->f call"
|
|
|
|
gdb_test "next" ".*pDe->vg.*" "next to pDe->vg call"
|
|
|
|
gdb_test "step" ".*E::vg.*" "step through thunk into E::vg"
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
do_tests
|