aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Pinski <pinskia@physics.uc.edu>2005-07-21 18:29:05 +0000
committerAndrew Pinski <pinskia@gcc.gnu.org>2005-07-21 11:29:05 -0700
commit757d1b88480bab90e01af9fb39b0c4b8b8367988 (patch)
tree28f900c8a2d43035d14efa2816140a93f1c5f87e
parentb2e0afa038d214c630f40c6c7aef0a6d8a1de1cc (diff)
downloadgcc-757d1b88480bab90e01af9fb39b0c4b8b8367988.zip
gcc-757d1b88480bab90e01af9fb39b0c4b8b8367988.tar.gz
gcc-757d1b88480bab90e01af9fb39b0c4b8b8367988.tar.bz2
re PR c++/22358 (C++ front-end produces mis-match types in MODIFY_EXPR)
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. From-SVN: r102240
-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 31c93f9..e464a66 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 9b85a4d..e60cc8b 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 c390032..04dfb01 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 0000000..dbce0f8
--- /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;