diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3a28b7c0e07af5a69e919bd4253b3053b47c9b8c..6db90d9bb66912057832d5556dfbb986a97af1c7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2004-08-10 Geoffrey Keating <geoffk@apple.com> + + * tree-vn.c (val_expr_pair_expr_eq): Compare vuses, to match the + hash function. + 2004-08-10 Roger Sayle <roger@eyesopen.com> * config/mips/mips.md: New reciprocal square root patterns that diff --git a/gcc/tree-vn.c b/gcc/tree-vn.c index b686af296afccd602c4018046d611a03ad9f7931..061a7ac91047cf03469bed289f8ddddab2405f87 100644 --- a/gcc/tree-vn.c +++ b/gcc/tree-vn.c @@ -151,11 +151,20 @@ val_expr_pair_expr_eq (const void *p1, const void *p2) { const val_expr_pair_t ve1 = (val_expr_pair_t) p1; const val_expr_pair_t ve2 = (val_expr_pair_t) p2; + size_t i; - if (expressions_equal_p (ve1->e, ve2->e)) - return true; + if (! expressions_equal_p (ve1->e, ve2->e)) + return false; + + if (NUM_VUSES (ve1->vuses) != NUM_VUSES (ve2->vuses)) + return false; - return false; + for (i = 0; i < NUM_VUSES (ve1->vuses); i++) + if (! expressions_equal_p (VUSE_OP (ve1->vuses, i), + VUSE_OP (ve2->vuses, i))) + return false; + + return true; }