re PR c++/44969 ([C++0x] <type_traits> std::is_constructible broken for fundamental...

	PR c++/44969
	* tree.c (cp_tree_equal): Compare type of *CAST_EXPR.
	* pt.c (iterative_hash_template_arg): Hash type of *CAST_EXPR.

From-SVN: r162307

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 63d24a2ac1214065a63bf97438b8bdc6a6bef661..9a7c1a4871355a25d37d23a78d3a6d1071020aa3 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-19  Jason Merrill  <jason@redhat.com>
+
+       PR c++/44969
+       * tree.c (cp_tree_equal): Compare type of *CAST_EXPR.
+       * pt.c (iterative_hash_template_arg): Hash type of *CAST_EXPR.
+
 2010-07-19  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR c++/44969

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 3259043f4ae9a47870b0334321c07928e93e7f2d..0ccd8d9df5d5e7dd113126045aba4df5788177dc 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -1566,31 +1566,43 @@ iterative_hash_template_arg (tree arg, hashval_t val)
       gcc_assert (seen_error ());
       return val;
 
+    case CAST_EXPR:
+    case STATIC_CAST_EXPR:
+    case REINTERPRET_CAST_EXPR:
+    case CONST_CAST_EXPR:
+    case DYNAMIC_CAST_EXPR:
+    case NEW_EXPR:
+      val = iterative_hash_template_arg (TREE_TYPE (arg), val);
+      /* Now hash operands as usual.  */
+      break;
+
     default:
-      switch (tclass)
-       {
-       case tcc_type:
-         if (TYPE_CANONICAL (arg))
-           return iterative_hash_object (TYPE_HASH (TYPE_CANONICAL (arg)),
-                                         val);
-         else if (TREE_CODE (arg) == DECLTYPE_TYPE)
-           return iterative_hash_template_arg (DECLTYPE_TYPE_EXPR (arg), val);
-         /* Otherwise just compare the types during lookup.  */
-         return val;
+      break;
+    }
 
-       case tcc_declaration:
-       case tcc_constant:
-         return iterative_hash_expr (arg, val);
+  switch (tclass)
+    {
+    case tcc_type:
+      if (TYPE_CANONICAL (arg))
+       return iterative_hash_object (TYPE_HASH (TYPE_CANONICAL (arg)),
+                                     val);
+      else if (TREE_CODE (arg) == DECLTYPE_TYPE)
+       return iterative_hash_template_arg (DECLTYPE_TYPE_EXPR (arg), val);
+      /* Otherwise just compare the types during lookup.  */
+      return val;
 
-       default:
-         gcc_assert (IS_EXPR_CODE_CLASS (tclass));
-         {
-           unsigned n = TREE_OPERAND_LENGTH (arg);
-           for (i = 0; i < n; ++i)
-             val = iterative_hash_template_arg (TREE_OPERAND (arg, i), val);
-           return val;
-         }
-       }
+    case tcc_declaration:
+    case tcc_constant:
+      return iterative_hash_expr (arg, val);
+
+    default:
+      gcc_assert (IS_EXPR_CODE_CLASS (tclass));
+      {
+       unsigned n = TREE_OPERAND_LENGTH (arg);
+       for (i = 0; i < n; ++i)
+         val = iterative_hash_template_arg (TREE_OPERAND (arg, i), val);
+       return val;
+      }
     }
   gcc_unreachable ();
   return 0;

diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index d62f9d7acf613639171211458c3081106c2f9e27..2abd8dd1a2c12669bf473f3da8350f40726d78c5 100644 (file)
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -2191,6 +2191,17 @@ cp_tree_equal (tree t1, tree t2)
       return same_type_p (TRAIT_EXPR_TYPE1 (t1), TRAIT_EXPR_TYPE1 (t2))
        && same_type_p (TRAIT_EXPR_TYPE2 (t1), TRAIT_EXPR_TYPE2 (t2));
 
+    case CAST_EXPR:
+    case STATIC_CAST_EXPR:
+    case REINTERPRET_CAST_EXPR:
+    case CONST_CAST_EXPR:
+    case DYNAMIC_CAST_EXPR:
+    case NEW_EXPR:
+      if (!same_type_p (TREE_TYPE (t1), TREE_TYPE (t2)))
+       return false;
+      /* Now compare operands as usual.  */
+      break;
+
     default:
       break;
     }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3720357bf7f34924f682cc3dd99c3206481f5993..fbe239847bdaee56c99dd88a92c2792447492946 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-19  Jason Merrill  <jason@redhat.com>
+
+       PR c++/44969
+       * g++.dg/template/sfinae24.C: New.
+
 2010-07-19  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR fortran/44353

diff --git a/gcc/testsuite/g++.dg/template/sfinae24.C b/gcc/testsuite/g++.dg/template/sfinae24.C
new file mode 100644 (file)
index 0000000..7138c96
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/sfinae24.C
@@ -0,0 +1,26 @@
+// PR c++/44969
+
+template<bool, typename T = void> struct enable_if { typedef T type; };
+template<typename T> struct enable_if<false, T> { };
+
+template<typename Tp, typename Arg1, typename Arg2>
+  class mini_is_constructible
+  {
+    typedef char one;
+    typedef struct { char arr[2]; } two;
+
+    template<typename Tp1, typename Arg1_, typename Arg2_>
+      static typename
+      enable_if<(sizeof(Tp1(Arg1_(), Arg2_()), 1) > 0), one>::type
+      test(int);
+
+    template<typename, typename, typename>
+      static two test(...);
+
+  public:
+    static const bool value = sizeof(test<Tp, Arg1, Arg2>(0)) == 1;
+  };
+
+class A { };
+
+int Test[mini_is_constructible<int, A, A>::value ? -1 : 1];