2003-11-25 Michael Chastain <mec@gnu.mindspring.com>

	* gdb/class2.exp: New file.
	* gdb/class2.cc: New file.

3 files changed, 186 insertions, 0 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d06e87c9743..415fdcf777d 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-25  Michael Chastain  <mec@gnu.mindspring.com>
+
+	* gdb/class2.exp: New file.
+	* gdb/class2.cc: New file.
+
 2003-11-25  Michael Chastain  <mec.gnu@mindspring.com>
 
 	* gdb.cp/templates.exp (test_ptype_of_templates): Accept output
diff --git a/gdb/testsuite/gdb.cp/class2.cc b/gdb/testsuite/gdb.cp/class2.cc
new file mode 100644
index 00000000000..16cf98891aa
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/class2.cc
@@ -0,0 +1,66 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 2003 Free Software Foundation, Inc.
+
+   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
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   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.
+ 
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+   Please email any bugs, comments, and/or additions to this file to:
+   bug-gdb@prep.ai.mit.edu  */
+
+struct A
+{
+  virtual ~A ();
+  int a1;
+};
+
+A::~A()
+{
+  a1 = 800;
+}
+
+struct B : public A
+{
+  virtual ~B ();
+  int b1;
+  int b2;
+};
+
+B::~B()
+{
+  a1 = 900;
+  b1 = 901;
+  b2 = 902;
+}
+
+// Stop the compiler from optimizing away data.
+void refer (A *)
+{
+  ;
+}
+
+int main (void)
+{
+  A alpha, *aap, *abp;
+  B beta, *bbp;
+
+  alpha.a1 = 100;
+  beta.a1 = 200; beta.b1 = 201; beta.b2 = 202;
+
+  aap = &alpha; refer (aap);
+  abp = &beta;  refer (abp);
+  bbp = &beta;  refer (bbp);
+
+  return 0;  // marker return 0
+} // marker close brace
diff --git a/gdb/testsuite/gdb.cp/class2.exp b/gdb/testsuite/gdb.cp/class2.exp
new file mode 100644
index 00000000000..9d5534566d2
--- /dev/null
+++ b/gdb/testsuite/gdb.cp/class2.exp
@@ -0,0 +1,115 @@
+# Copyright 2003 Free Software Foundation, Inc.
+
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# 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.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+
+if $tracelevel then {
+    strace $tracelevel
+    }
+
+if { [skip_cplus_tests] } { continue }
+
+set prms_id 0
+set bug_id 0
+
+set testfile "class2"
+set srcfile ${testfile}.cc
+set binfile ${objdir}/${subdir}/${testfile}
+
+# Create and source the file that provides information about the compiler
+# used to compile the test case.
+if [get_compiler_info ${binfile} "c++"] {
+    return -1
+}
+
+if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
+    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+}
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+# Start with "set print object off".
+
+gdb_test "set print object off" ""
+
+if ![runto_main] then {
+    perror "couldn't run to main"
+    continue
+}
+
+get_debug_format
+
+gdb_test "break [gdb_get_line_number "marker return 0"]" \
+    "Breakpoint.*at.* file .*" ""
+
+gdb_test "continue" "Breakpoint .* at .*" ""
+
+# Access the "A" object.
+
+gdb_test "print alpha" \
+    "= {.*a1 = 100.*}" \
+    "print alpha at marker return 0"
+
+# Access the "B" object.
+
+gdb_test "print beta" \
+    "= {.*a1 = 200.*b1 = 201.*b2 = 202}" \
+    "print beta at marker return 0"
+
+# Access the "A" object through an "A *" pointer.
+
+gdb_test_multiple "print * aap" "print * aap at marker return 0" {
+    -re "= {.*a1 = 100.*}\r\n$gdb_prompt $" {
+	# gcc 2.95.3 -gstabs+
+	# gcc 3.3.2 -gdwarf-2
+	# gcc 3.3.2 -gstabs+
+	pass "print * aap at marker return 0"
+    }
+    -re "= {.*a1 = .*}\r\n$gdb_prompt $" {
+	if { [test_compiler_info gcc-2-*] && [test_debug_format "DWARF 2"] } {
+	    # gcc 2.95.3 -gdwarf-2
+	    setup_kfail "gdb/1465" "*-*-*"
+	}
+	fail "print * aap at marker return 0"
+    }
+}
+
+# Access the "B" object through a "B *" pointer.
+
+gdb_test "print * bbp" \
+    "= {.*a1 = 200.*b1 = 201.*b2 = 202}" \
+    "print * bbp at marker return 0"
+
+# Access the "B" object through an "A *" pointer.
+# This should print using the "A" type.
+
+gdb_test_multiple "print * abp" "print * abp at marker return 0, s-p-o off" {
+    -re "= {.*a1 = 200.*b1 = .*b2 = .*}\r\n$gdb_prompt $" {
+	# This would violate the documentation for "set print object off".
+	fail "print * abp at marker return 0, s-p-o off"
+    }
+    -re "= {.*a1 = 200.*}\r\n$gdb_prompt $" {
+	pass "print * abp at marker return 0, s-p-o off"
+    }
+}
+
+# Access the "B" object through a "B *" pointer expression.
+# This should print using the "B" type.
+
+gdb_test "print * (B *) abp" \
+    "= {.*a1 = 200.*b1 = 201.*b2 = 202}" \
+    "print * (B *) abp at marker return 0"