re PR c++/48531 ([C++0x][SFINAE] Hard errors with arrays of unknown bound)

	PR c++/48531
	* typeck2.c (build_functional_cast): Disallow array type.

From-SVN: r172632

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 04812d16b89e7782724764f56a0beadf79bffbc1..9364d01ac19497157f12cc2e111c6ef9975e0f9a 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-17  Jason Merrill  <jason@redhat.com>
 
+       PR c++/48531
+       * typeck2.c (build_functional_cast): Disallow array type.
+
        * tree.c (get_target_expr): Handle VEC_INIT_EXPR.
 
 2011-04-17  Jan Hubicka  <jh@suse.cz>

diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index fad7f0c3004af0eb2663378e6e4f3bd54a7784dd..3280d9b5d0dc221dd089496ab8ad045270ea5902 100644 (file)
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -369,6 +369,8 @@ build_value_init (tree type, tsubst_flags_t complain)
 tree
 build_value_init_noctor (tree type, tsubst_flags_t complain)
 {
+  /* FIXME the class and array cases should just use digest_init once it is
+     SFINAE-enabled.  */
   if (CLASS_TYPE_P (type))
     {
       gcc_assert (!TYPE_NEEDS_CONSTRUCTING (type));
@@ -450,7 +452,9 @@ build_value_init_noctor (tree type, tsubst_flags_t complain)
          if (ce->value == error_mark_node)
            return error_mark_node;
 
-         /* The gimplifier can't deal with a RANGE_EXPR of TARGET_EXPRs.  */
+         /* We shouldn't have gotten here for anything that would need
+            non-trivial initialization, and gimplify_init_ctor_preeval
+            would need to be fixed to allow it.  */
          gcc_assert (TREE_CODE (ce->value) != TARGET_EXPR
                      && TREE_CODE (ce->value) != AGGR_INIT_EXPR);
        }

diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index 20b47d59b7e75726e4802dfa634f2584fcffb1aa..f0b67f73e21a0238539f73c4f58a8fdea49c53cf 100644 (file)
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -1534,6 +1534,15 @@ build_functional_cast (tree exp, tree parms, tsubst_flags_t complain)
   else
     type = exp;
 
+  /* We need to check this explicitly, since value-initialization of
+     arrays is allowed in other situations.  */
+  if (TREE_CODE (type) == ARRAY_TYPE)
+    {
+      if (complain & tf_error)
+       error ("functional cast to array type %qT", type);
+      return error_mark_node;
+    }
+
   if (processing_template_decl)
     {
       tree t;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fa74ad298ff412dc703d63cfa6b83af3fc24381a..5a28f60e49aa413cf3810e4e80030e38f3ab79b4 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-17  Jason Merrill  <jason@redhat.com>
+
+       * g++.dg/cpp0x/sfinae16.C: New.
+
 2011-04-17  Richard Sandiford  <rdsandiford@googlemail.com>
 
        * gcc.target/mips/reg-var-1.c: New test.

diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae16.C b/gcc/testsuite/g++.dg/cpp0x/sfinae16.C
new file mode 100644 (file)
index 0000000..6470567
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae16.C
@@ -0,0 +1,17 @@
+// PR c++/48531
+// { dg-options -std=c++0x }
+
+template<class T,
+  class = decltype(T())
+>
+char f(int);
+
+template<class>
+double f(...);
+
+struct B2 {
+  B2(...);
+};
+
+#define SA(X) static_assert ((X), #X);
+SA(sizeof(f<B2[2]>(0)) != 1);