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

gcc/cp/ChangeLog

+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).

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;
     }

gcc/testsuite/ChangeLog

+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

gcc/testsuite/g++.dg/other/pr22358.C

+/* { dg-do compile } */
+
+struct a
+{
+  virtual ~a();
+};
+struct b : virtual a { };
+b a11;