From 6f9f76e336e9ce7a1c070351e4d21e6b84c0e82c Mon Sep 17 00:00:00 2001 From: Simon Martin Date: Thu, 11 Jan 2007 19:46:03 +0000 Subject: re PR c++/29573 (ICE after parse error in template argument) 2007-01-11 Simon Martin PR c++/29573 * tree.c (cp_tree_equal): Properly handle MODOP_EXPR trees. From-SVN: r120683 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/tree.c | 15 +++++++++++++++ 2 files changed, 20 insertions(+) (limited to 'gcc/cp') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 74af04c..12a3cc6 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2007-01-11 Simon Martin + + PR c++/29573 + * tree.c (cp_tree_equal): Properly handle MODOP_EXPR trees. + 2007-01-10 Mark Mitchell PR c++/28999 diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index ae3dc4c..742e090 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -1709,6 +1709,21 @@ cp_tree_equal (tree t1, tree t2) return cp_tree_equal (o1, o2); } + case MODOP_EXPR: + { + tree t1_op1, t2_op1; + + if (!cp_tree_equal (TREE_OPERAND (t1, 0), TREE_OPERAND (t2, 0))) + return false; + + t1_op1 = TREE_OPERAND (t1, 1); + t2_op1 = TREE_OPERAND (t2, 1); + if (TREE_CODE (t1_op1) != TREE_CODE (t2_op1)) + return false; + + return cp_tree_equal (TREE_OPERAND (t1, 2), TREE_OPERAND (t2, 2)); + } + case PTRMEM_CST: /* Two pointer-to-members are the same if they point to the same field or function in the same class. */ -- cgit v1.1