diff options
| author | Jason Merrill <jason@redhat.com> | 2011-08-06 00:34:21 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-08-06 00:34:21 -0400 |
| commit | 5c67ef9aef20c1be9e6214b2cf8ea86df1af5415 (patch) | |
| tree | 97bd80367a5e914bb18bd4b665b11472a102349b | |
| parent | de9ef71ca76369222554fcc2b4cb533c3b094289 (diff) | |
| download | gcc-5c67ef9aef20c1be9e6214b2cf8ea86df1af5415.zip gcc-5c67ef9aef20c1be9e6214b2cf8ea86df1af5415.tar.gz gcc-5c67ef9aef20c1be9e6214b2cf8ea86df1af5415.tar.bz2 | |
re PR c++/49988 (constexpr on ctor invokes improper initialization)
PR c++/49988
* semantics.c (cxx_eval_array_reference): Handle failure to
reduce the array operand to something we can work with.
From-SVN: r177496
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 9 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/constexpr-non-const-arg3.C | 23 |
4 files changed, 42 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9fe6450..3c1ad7f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-08-05 Jason Merrill <jason@redhat.com> + + PR c++/49988 + * semantics.c (cxx_eval_array_reference): Handle failure to + reduce the array operand to something we can work with. + 2011-08-05 Gabriel Charette <gchare@google.com> * decl.c (finish_function): Remove unecessary line 0 hack. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index ac24b77..2f02e69 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -6428,12 +6428,19 @@ cxx_eval_array_reference (const constexpr_call *call, tree t, elem_type = TREE_TYPE (TREE_TYPE (ary)); if (TREE_CODE (ary) == CONSTRUCTOR) len = CONSTRUCTOR_NELTS (ary); - else + else if (TREE_CODE (ary) == STRING_CST) { elem_nchars = (TYPE_PRECISION (elem_type) / TYPE_PRECISION (char_type_node)); len = (unsigned) TREE_STRING_LENGTH (ary) / elem_nchars; } + else + { + /* We can't do anything with other tree codes, so use + VERIFY_CONSTANT to complain and fail. */ + VERIFY_CONSTANT (ary); + gcc_unreachable (); + } if (compare_tree_int (index, len) >= 0) { if (tree_int_cst_lt (index, array_type_nelts_top (TREE_TYPE (ary)))) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e6f0cd7..af49861 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-08-05 Jason Merrill <jason@redhat.com> + + PR c++/49988 + * g++.dg/cpp0x/constexpr-non-const-arg3.C: New. + 2011-08-05 H.J. Lu <hongjiu.lu@intel.com> PR target/47369 diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-non-const-arg3.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-non-const-arg3.C new file mode 100644 index 0000000..581be6d --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-non-const-arg3.C @@ -0,0 +1,23 @@ +// PR c++/49988 +// { dg-options -std=c++0x } +// { dg-do run } + +template<int ... I> struct X { }; + +struct A { + char data[3]; + template<int ... I> + constexpr + A(const char (&s)[3], X<I...> x) : data{ s[I]...} { } +}; +struct B { + A a; + B(const char (&s)[3]) : a{s,X<0,1,2>{}} { } +}; + +int main() +{ + B b{"12"}; + if (b.a.data[0] != '1') + return 1; +} |