From e2a009c710b96a3dcb81eba7ff574fd53f68fea5 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Thu, 14 Apr 2011 11:00:15 -0400
Subject: [PATCH] re PR c++/48531 ([C++0x][SFINAE] Hard errors with arrays of
 unknown bound)

	PR c++/48531
	* init.c (build_value_init_noctor): Check complain consistently.

From-SVN: r172434
---
 gcc/cp/ChangeLog                      |  3 +++
 gcc/cp/init.c                         |  4 +++-
 gcc/testsuite/ChangeLog               |  2 ++
 gcc/testsuite/g++.dg/cpp0x/sfinae15.C | 12 ++++++++++++
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/sfinae15.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1b60dd439dd..64ea98e1feb 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-14  Jason Merrill  <jason@redhat.com>
 
+	PR c++/48531
+	* init.c (build_value_init_noctor): Check complain consistently.
+
 	PR c++/48557
 	* typeck.c (cp_build_binary_op): Don't decay void operands.
 
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 32afa03f538..fad7f0c3004 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -422,7 +422,9 @@ build_value_init_noctor (tree type, tsubst_flags_t complain)
 	 as we don't know the size of the array yet.  */
       if (max_index == error_mark_node)
 	{
-	  error ("cannot value-initialize array of unknown bound %qT", type);
+	  if (complain & tf_error)
+	    error ("cannot value-initialize array of unknown bound %qT",
+		   type);
 	  return error_mark_node;
 	}
       gcc_assert (TREE_CODE (max_index) == INTEGER_CST);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8a5f5ae9069..3eca0d40393 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-14  Jason Merrill  <jason@redhat.com>
 
+	* g++.dg/cpp0x/sfinae15.C: New.
+
 	* g++.dg/cpp0x/sfinae14.C: New.
 
 	* g++.dg/ext/vla10.C: New.
diff --git a/gcc/testsuite/g++.dg/cpp0x/sfinae15.C b/gcc/testsuite/g++.dg/cpp0x/sfinae15.C
new file mode 100644
index 00000000000..595ca40b555
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/sfinae15.C
@@ -0,0 +1,12 @@
+// PR c++/48531
+// { dg-options -std=c++0x }
+
+template<class T,
+  class = decltype(T())
+>
+char f(int);
+
+template<class>
+char (&f(...))[2];
+
+static_assert(sizeof(f<int[]>(0)) != 1, "Error");
-- 
2.30.2