diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2014-04-04 20:11:47 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2014-04-04 20:11:47 +0000 |
| commit | 9119c7fabaf186b2018292e6d92733c9e50237a1 (patch) | |
| tree | 7717a02bc23e663b5c18a9a442b444c378d4e83f | |
| parent | e005b7535962c191feb0a6ca75668b9437450e6b (diff) | |
| download | gcc-9119c7fabaf186b2018292e6d92733c9e50237a1.zip gcc-9119c7fabaf186b2018292e6d92733c9e50237a1.tar.gz gcc-9119c7fabaf186b2018292e6d92733c9e50237a1.tar.bz2 | |
re PR c++/58207 (ICE in sort_constexpr_mem_initializers due to out of bounds vector access)
/cp
2014-04-04 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/58207
* semantics.c (sort_constexpr_mem_initializers): Robustify loop.
/testsuite
2014-04-04 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/58207
* g++.dg/cpp0x/constexpr-ice15.C: New.
From-SVN: r209128
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 14 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/constexpr-ice15.C | 12 |
4 files changed, 29 insertions, 7 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b3b9ccb..76f7aa9 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2014-04-04 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/58207 + * semantics.c (sort_constexpr_mem_initializers): Robustify loop. + 2014-04-04 Patrick Palka <patrick@parcs.ath.cx> PR c++/44613 diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 9269541..3619e27 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -7720,8 +7720,8 @@ sort_constexpr_mem_initializers (tree type, vec<constructor_elt, va_gc> *v) { tree pri = CLASSTYPE_PRIMARY_BINFO (type); tree field_type; - constructor_elt elt; - int i; + unsigned i; + constructor_elt *ce; if (pri) field_type = BINFO_TYPE (pri); @@ -7732,14 +7732,14 @@ sort_constexpr_mem_initializers (tree type, vec<constructor_elt, va_gc> *v) /* Find the element for the primary base or vptr and move it to the beginning of the vec. */ - vec<constructor_elt, va_gc> &vref = *v; - for (i = 0; ; ++i) - if (TREE_TYPE (vref[i].index) == field_type) + for (i = 0; vec_safe_iterate (v, i, &ce); ++i) + if (TREE_TYPE (ce->index) == field_type) break; - if (i > 0) + if (i > 0 && i < vec_safe_length (v)) { - elt = vref[i]; + vec<constructor_elt, va_gc> &vref = *v; + constructor_elt elt = vref[i]; for (; i > 0; --i) vref[i] = vref[i-1]; vref[0] = elt; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b073b7f..0cd68ca 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-04-04 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/58207 + * g++.dg/cpp0x/constexpr-ice15.C: New. + 2014-04-04 Jan Hubicka <hubicka@ucw.cz> PR ipa/59626 diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ice15.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ice15.C new file mode 100644 index 0000000..576fd41 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ice15.C @@ -0,0 +1,12 @@ +// PR c++/58207 +// { dg-do compile { target c++11 } } + +struct A +{ + virtual bool foo (); +}; + +struct B : public A +{ + constexpr B () : A (&::n) {} // { dg-error "declared" } +}; |