re PR c++/66921 (failure to determine size of static constexpr array that is…

re PR c++/66921 (failure to determine size of static constexpr array that is nested within a templated class)

	PR c++/66921
	* decl.c (cp_complete_array_type): Allow an initializer that
	already has array type.

From-SVN: r231914

gcc/cp/ChangeLog

 2015-12-22  Jason Merrill  <jason@redhat.com>
 
+	PR c++/66921
+	* decl.c (cp_complete_array_type): Allow an initializer that
+	already has array type.
+
 	PR c++/67257
 	* parser.c (cp_parser_single_declaration): Reject a class template
 	that also declares a variable.

gcc/cp/decl.c

@@ -7479,7 +7479,8 @@ cp_complete_array_type (tree *ptype, tree initial_value, bool do_default)
 
   /* Don't get confused by a CONSTRUCTOR for some other type.  */
   if (initial_value && TREE_CODE (initial_value) == CONSTRUCTOR
-      && !BRACE_ENCLOSED_INITIALIZER_P (initial_value))
+      && !BRACE_ENCLOSED_INITIALIZER_P (initial_value)
+      && TREE_CODE (TREE_TYPE (initial_value)) != ARRAY_TYPE)
     return 1;
 
   if (initial_value)

gcc/testsuite/g++.dg/cpp0x/constexpr-array14.C

+// PR c++/66921
+// { dg-do compile { target c++11 } }
+
+template<typename T>
+struct Holder {
+  constexpr static const int array[] = { 1, 2, 3 };
+  enum {F = array[0]};
+};
+class HI: public Holder<int> {};