PR bootstrap/78817 - stage2 bootstrap failure in vec.h:1613:5: error: argument 1...

gcc/ChangeLog:
	* vec.h (vec<T, va_heap, vl_ptr>::safe_grow_cleared): Assert
	a pointer is non-null.

From-SVN: r243736

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fcb9410ce0344aa3b29a0d064a4072fe0c0cd160..3ebbc1cd13e910b4593d5c12458940cb55290a57 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-15  Martin Sebor  <msebor@redhat.com>
+
+       PR bootstrap/78817
+       * vec.h (vec<T, va_heap, vl_ptr>::safe_grow_cleared): Assert
+       a pointer is non-null.
+
 2016-12-15  Andrew Senkevich  <andrew.senkevich@intel.com>
 
        * config/i386/avx512bwintrin.h: Add new k-mask intrinsics.

diff --git a/gcc/vec.h b/gcc/vec.h
index aa93411132b54094830306a436001aa8296b3be7..3877f2d8ffef416172082065c676c735a588f430 100644 (file)
--- a/gcc/vec.h
+++ b/gcc/vec.h
@@ -1607,10 +1607,16 @@ inline void
 vec<T, va_heap, vl_ptr>::safe_grow_cleared (unsigned len MEM_STAT_DECL)
 {
   unsigned oldlen = length ();
-  size_t sz = sizeof (T) * (len - oldlen);
-  safe_grow (len PASS_MEM_STAT);
-  if (sz != 0)
-    memset (&(address ()[oldlen]), 0, sz);
+  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);
+    }
 }