From 14b1860e4e982d27e6669621c105e72d6c8bff41 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 7 Dec 2011 20:51:54 +0100 Subject: [PATCH] re PR c++/51369 ([c++0x] [4.7 Regression] ICE using constexpr in template) PR c++/51369 * init.c (build_value_init): Allow array types even when processing_template_decl. * g++.dg/cpp0x/constexpr-51369.C: New test. From-SVN: r182086 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/init.c | 3 ++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/cpp0x/constexpr-51369.C | 12 ++++++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/constexpr-51369.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 71a707e80bb..76bd0af6162 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-12-07 Jakub Jelinek + + PR c++/51369 + * init.c (build_value_init): Allow array types even when + processing_template_decl. + 2011-12-07 Ed Smith-Rowland <3dw4rd@verizon.net> PR c++/51420 diff --git a/gcc/cp/init.c b/gcc/cp/init.c index e1eb681de67..e93e82cac57 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -333,7 +333,8 @@ build_value_init (tree type, tsubst_flags_t complain) constructor. */ /* The AGGR_INIT_EXPR tweaking below breaks in templates. */ - gcc_assert (!processing_template_decl || SCALAR_TYPE_P (type)); + gcc_assert (!processing_template_decl + || (SCALAR_TYPE_P (type) || TREE_CODE (type) == ARRAY_TYPE)); if (CLASS_TYPE_P (type)) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 04d6c2304f1..1a4a182a8f7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-12-07 Jakub Jelinek + + PR c++/51369 + * g++.dg/cpp0x/constexpr-51369.C: New test. + 2011-12-07 Andrew Pinski PR middle-end/45416 diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-51369.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-51369.C new file mode 100644 index 00000000000..6606be8b6f3 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-51369.C @@ -0,0 +1,12 @@ +// PR c++/51369 +// { dg-do compile } +// { dg-options "-std=c++11" } + +constexpr int x[2][2] = {}; + +template +void +foo () +{ + x[0][0]; +}