From: Jason Merrill <jason@redhat.com>
Date: Wed, 8 Oct 2014 00:25:35 +0000 (-0400)
Subject: * tree.c (cp_tree_equal) [TRAIT_EXPR]: Use cp_tree_equal for type2.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cf5986dfbcc1acd731c3dda696385ff45c52f352;p=gcc.git

* tree.c (cp_tree_equal) [TRAIT_EXPR]: Use cp_tree_equal for type2.

From-SVN: r215991
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 10084c4903a..77a825e86f8 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-07  Jason Merrill  <jason@redhat.com>
+
+	* tree.c (cp_tree_equal) [TRAIT_EXPR]: Use cp_tree_equal for type2.
+
 2014-10-06  Edward Smith-Rowland  <3dw4rd@verizon.net>
 
 	* cp/parser.c: Allow [[deprecated]] for C++11.  Issue a pedwarn.
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 316c8ff8d40..cfb0ed8c299 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -2891,7 +2891,7 @@ cp_tree_equal (tree t1, tree t2)
       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));
+	&& cp_tree_equal (TRAIT_EXPR_TYPE2 (t1), TRAIT_EXPR_TYPE2 (t2));
 
     case CAST_EXPR:
     case STATIC_CAST_EXPR: