summaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorpinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4>2005-07-21 18:29:05 +0000
committerpinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4>2005-07-21 18:29:05 +0000
commit9ef9d27e792c866443466a84df0db4812d68c3e7 (patch)
tree28f900c8a2d43035d14efa2816140a93f1c5f87e /gcc
parent7dac75dff0f4b793dab41b03b132534fc448e52a (diff)
downloadgcc-9ef9d27e792c866443466a84df0db4812d68c3e7.tar.gz
2005-07-21 Andrew Pinski <pinskia@physics.uc.edu>
PR C++/22358 * g++.dg/other/pr22358.C: New test. 2005-07-21 Andrew Pinski <pinskia@physics.uc.edu> PR C++/22358 * class.c (build_base_path): Convert BINFO_OFFSET to the correct type. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@102240 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/class.c3
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/other/pr22358.C8
4 files changed, 20 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 31c93f9adc2..e464a661853 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-21 Andrew Pinski <pinskia@physics.uc.edu>
+
+ PR C++/22358
+ * class.c (build_base_path): Convert BINFO_OFFSET to the correct type.
+
2005-07-21 Volker Reichelt <reichelt@igpm.rwth-aachen.de>
* call.c: Fix comment typo(s).
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 9b85a4df2e9..e60cc8b4f46 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -365,7 +365,8 @@ build_base_path (enum tree_code code,
build2 (EQ_EXPR, boolean_type_node,
current_in_charge_parm, integer_zero_node),
v_offset,
- BINFO_OFFSET (binfo));
+ convet_to_integer (ptrdiff_type_node,
+ BINFO_OFFSET (binfo)));
else
offset = v_offset;
}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c390032ef66..04dfb01cf4c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-21 Andrew Pinski <pinskia@physics.uc.edu>
+
+ PR C++/22358
+ * g++.dg/other/pr22358.C: New test.
+
2005-07-21 Douglas Gregor <doug.gregor@gmail.com>
PR c++/2922
diff --git a/gcc/testsuite/g++.dg/other/pr22358.C b/gcc/testsuite/g++.dg/other/pr22358.C
new file mode 100644
index 00000000000..dbce0f8a1a7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/pr22358.C
@@ -0,0 +1,8 @@
+/* { dg-do compile } */
+
+struct a
+{
+ virtual ~a();
+};
+struct b : virtual a { };
+b a11;