diff options
| author | Jason Merrill <jason@redhat.com> | 2010-07-21 10:38:12 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2010-07-21 10:38:12 -0400 |
| commit | 31d06664e65339af78d370e8eb1cc22b6bb16b17 (patch) | |
| tree | 42b2c1b857a8e718389085c5f1550afe34b7ca81 /gcc/cp/tree.c | |
| parent | 557165ae948664887ee1576206ec7308250c463f (diff) | |
| download | gcc-31d06664e65339af78d370e8eb1cc22b6bb16b17.zip gcc-31d06664e65339af78d370e8eb1cc22b6bb16b17.tar.gz gcc-31d06664e65339af78d370e8eb1cc22b6bb16b17.tar.bz2 | |
* tree.c (cp_tree_equal): Fix CONSTRUCTOR handling.
From-SVN: r162378
Diffstat (limited to 'gcc/cp/tree.c')
| -rw-r--r-- | gcc/cp/tree.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 2abd8dd..450b9e8 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -2023,11 +2023,21 @@ cp_tree_equal (tree t1, tree t2) /* We need to do this when determining whether or not two non-type pointer to member function template arguments are the same. */ - if (!(same_type_p (TREE_TYPE (t1), TREE_TYPE (t2)) - /* The first operand is RTL. */ - && TREE_OPERAND (t1, 0) == TREE_OPERAND (t2, 0))) + if (!same_type_p (TREE_TYPE (t1), TREE_TYPE (t2)) + || CONSTRUCTOR_NELTS (t1) != CONSTRUCTOR_NELTS (t2)) return false; - return cp_tree_equal (TREE_OPERAND (t1, 1), TREE_OPERAND (t2, 1)); + { + tree field, value; + unsigned int i; + FOR_EACH_CONSTRUCTOR_ELT (CONSTRUCTOR_ELTS (t1), i, field, value) + { + constructor_elt *elt2 = CONSTRUCTOR_ELT (t2, i); + if (!cp_tree_equal (field, elt2->index) + || !cp_tree_equal (value, elt2->value)) + return false; + } + } + return true; case TREE_LIST: if (!cp_tree_equal (TREE_PURPOSE (t1), TREE_PURPOSE (t2))) |