2007-04-09 Paolo Carlini <pcarlini@suse.de>

	* tree.c (cp_tree_equal): Deal with TRAIT_EXPR.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123673 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2dd5fe4..9f21ddc 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-09  Paolo Carlini  <pcarlini@suse.de>
+
+       * tree.c (cp_tree_equal): Deal with TRAIT_EXPR.
+

 2007-04-08  Steven Bosscher  <steven@gcc.gnu.org>
 
        * cp-objcp-common.h (LANG_HOOKS_TREE_INLINING_ADD_PENDING_FN_DECLS):
 2007-04-08  Steven Bosscher  <steven@gcc.gnu.org>
 
        * cp-objcp-common.h (LANG_HOOKS_TREE_INLINING_ADD_PENDING_FN_DECLS):

diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 30aa359..a8ff6f6 100644 (file)
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -1828,6 +1828,12 @@ cp_tree_equal (tree t1, tree t2)
        return false;
       return cp_tree_equal (OVL_CHAIN (t1), OVL_CHAIN (t2));
 
        return false;
       return cp_tree_equal (OVL_CHAIN (t1), OVL_CHAIN (t2));
 

+    case TRAIT_EXPR:
+      if (TRAIT_EXPR_KIND (t1) != TRAIT_EXPR_KIND (t2))
+       return false;
+      return same_type_p (TRAIT_EXPR_TYPE1 (t1), TRAIT_EXPR_TYPE1 (t2))
+       && same_type_p (TRAIT_EXPR_TYPE2 (t1), TRAIT_EXPR_TYPE2 (t2));
+

     default:
       break;
     }
     default:
       break;
     }