diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2016-12-22 09:53:56 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2016-12-22 09:53:56 +0100 |
| commit | 0b435c16901f5642e2767dc72a53aad251f57661 (patch) | |
| tree | 971fe4f3aa86b5f71dc4ebe27e8b332b5d536f57 /gcc | |
| parent | 03c19813e73f8c7c7ca2fd30d398acf0b0f22310 (diff) | |
| download | gcc-0b435c16901f5642e2767dc72a53aad251f57661.zip gcc-0b435c16901f5642e2767dc72a53aad251f57661.tar.gz gcc-0b435c16901f5642e2767dc72a53aad251f57661.tar.bz2 | |
re PR bootstrap/78817 (stage2 bootstrap failure in vec.h:1613:5: error: argument 1 null where non-null expected after r243661)
PR bootstrap/78817
* vec.h (vec<T, va_heap, vl_ptr>::safe_grow_cleared): Revert
2016-12-15 change.
From-SVN: r243883
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/vec.h | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4574360..0b3c84f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-12-22 Jakub Jelinek <jakub@redhat.com> + + PR bootstrap/78817 + * vec.h (vec<T, va_heap, vl_ptr>::safe_grow_cleared): Revert + 2016-12-15 change. + 2016-12-21 Vladimir Makarov <vmakarov@redhat.com> PR rtl-optimization/78580 @@ -1607,16 +1607,10 @@ inline void vec<T, va_heap, vl_ptr>::safe_grow_cleared (unsigned len MEM_STAT_DECL) { unsigned oldlen = length (); - gcc_checking_assert (oldlen <= len); - - if (size_t sz = sizeof (T) * (len - oldlen)) - { - safe_grow (len PASS_MEM_STAT); - - T *p = address (); - gcc_assert (p != NULL); - memset (p + oldlen, 0, sz); - } + size_t sz = sizeof (T) * (len - oldlen); + safe_grow (len PASS_MEM_STAT); + if (sz != 0) + memset (&(address ()[oldlen]), 0, sz); } |