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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 31c93f9adc2a7e603f095b4f8ff00a62803b3543..e464a6618535ce1369e15744e8e89e5348d766af 100644 (file)
--- 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 9b85a4df2e9d0134a5a31f850d91633f300fe43b..e60cc8b4f46130136f5c1de48b41f00f855d19bc 100644 (file)
--- 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 c390032ef66ca2ee2a75df41cb46877ca49eee8e..04dfb01cf4c5ecd16424ac856495b8c4c808ae55 100644 (file)
--- 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 (file)
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;