diff options
Diffstat (limited to 'gcc/cp/tree.c')
| -rw-r--r-- | gcc/cp/tree.c | 58 |
1 files changed, 36 insertions, 22 deletions
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index cf39800..b80b52a 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -2174,6 +2174,33 @@ decl_anon_ns_mem_p (const_tree decl) } } +/* Subroutine of cp_tree_equal: t1 and t2 are the CALL_EXPR_FNs of two + CALL_EXPRS. Return whether they are equivalent. */ + +static bool +called_fns_equal (tree t1, tree t2) +{ + /* Core 1321: dependent names are equivalent even if the overload sets + are different. But do compare explicit template arguments. */ + tree name1 = dependent_name (t1); + tree name2 = dependent_name (t2); + if (name1 || name2) + { + tree targs1 = NULL_TREE, targs2 = NULL_TREE; + + if (name1 != name2) + return false; + + if (TREE_CODE (t1) == TEMPLATE_ID_EXPR) + targs1 = TREE_OPERAND (t1, 1); + if (TREE_CODE (t2) == TEMPLATE_ID_EXPR) + targs2 = TREE_OPERAND (t2, 1); + return cp_tree_equal (targs1, targs2); + } + else + return cp_tree_equal (t1, t2); +} + /* Return truthvalue of whether T1 is the same tree structure as T2. Return 1 if they are the same. Return 0 if they are different. */ @@ -2261,12 +2288,7 @@ cp_tree_equal (tree t1, tree t2) { tree arg1, arg2; call_expr_arg_iterator iter1, iter2; - /* Core 1321: dependent names are equivalent even if the - overload sets are different. */ - tree name1 = dependent_name (CALL_EXPR_FN (t1)); - tree name2 = dependent_name (CALL_EXPR_FN (t2)); - if (!(name1 && name2 && name1 == name2) - && !cp_tree_equal (CALL_EXPR_FN (t1), CALL_EXPR_FN (t2))) + if (!called_fns_equal (CALL_EXPR_FN (t1), CALL_EXPR_FN (t2))) return false; for (arg1 = first_call_expr_arg (t1, &iter1), arg2 = first_call_expr_arg (t2, &iter2); @@ -2354,26 +2376,18 @@ cp_tree_equal (tree t1, tree t2) TREE_TYPE (TEMPLATE_PARM_DECL (t2)))); case TEMPLATE_ID_EXPR: + return (cp_tree_equal (TREE_OPERAND (t1, 0), TREE_OPERAND (t2, 0)) + && cp_tree_equal (TREE_OPERAND (t1, 1), TREE_OPERAND (t2, 1))); + + case TREE_VEC: { unsigned ix; - tree vec1, vec2; - - if (!cp_tree_equal (TREE_OPERAND (t1, 0), TREE_OPERAND (t2, 0))) + if (TREE_VEC_LENGTH (t1) != TREE_VEC_LENGTH (t2)) return false; - vec1 = TREE_OPERAND (t1, 1); - vec2 = TREE_OPERAND (t2, 1); - - if (!vec1 || !vec2) - return !vec1 && !vec2; - - if (TREE_VEC_LENGTH (vec1) != TREE_VEC_LENGTH (vec2)) - return false; - - for (ix = TREE_VEC_LENGTH (vec1); ix--;) - if (!cp_tree_equal (TREE_VEC_ELT (vec1, ix), - TREE_VEC_ELT (vec2, ix))) + for (ix = TREE_VEC_LENGTH (t1); ix--;) + if (!cp_tree_equal (TREE_VEC_ELT (t1, ix), + TREE_VEC_ELT (t2, ix))) return false; - return true; } |