summaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
authorsayle <sayle@138bc75d-0d04-0410-961f-82ee72b054a4>2006-03-30 01:35:22 +0000
committersayle <sayle@138bc75d-0d04-0410-961f-82ee72b054a4>2006-03-30 01:35:22 +0000
commiteb5b85b520ec6eb938147dd31ac9047f9a498f40 (patch)
tree82546f6f13e370d85cdc2af9bce3cefe13cbc782 /gcc/cp
parentec9a997a928c93c9861b1250ce13a2f6fbec17d6 (diff)
downloadgcc-eb5b85b520ec6eb938147dd31ac9047f9a498f40.tar.gz
PR c++/22494
* init.c (build_vec_delete_1): Convert BASE pointer's type to the base pointer type to avoid a type mismatch in the EQ_EXPR. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@112529 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/init.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f154edcf602..67de4f7f61e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-29 Roger Sayle <roger@eyesopen.com>
+
+ PR c++/22494
+ * init.c (build_vec_delete_1): Convert BASE pointer's type to
+ the base pointer type to avoid a type mismatch in the EQ_EXPR.
+
2006-03-24 Carlos O'Donell <carlos@codesourcery.com>
* search.c (maybe_suppress_debug_info): If
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 6a7e625a00f..194b29baea8 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -2212,7 +2212,8 @@ build_vec_delete_1 (tree base, tree maxindex, tree type,
TREE_SIDE_EFFECTS (controller) = 1;
body = build1 (EXIT_EXPR, void_type_node,
- build2 (EQ_EXPR, boolean_type_node, base, tbase));
+ build2 (EQ_EXPR, boolean_type_node, tbase,
+ fold_convert (ptype, base)));
body = build_compound_expr
(body, build_modify_expr (tbase, NOP_EXPR,
build2 (MINUS_EXPR, ptype, tbase, size_exp)));