git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't try and free what must be a null vector when reserving 0 elements 

in va_heap::reserve

2013-11-05  Trevor Saunders  <tsaunders@mozilla.com>

	* vec.c (vec_prefix::calculate_allocation): Don't try to handle the
	case of no prefix and reserving zero slots, because when that's the
	case we'll never get here.
	* vec.h (va_heap::reserve): Don't try and handle
	vec_prefix::calculate_allocation returning zero because that should
	never happen.

From-SVN: r204392
This commit is contained in:
Trevor Saunders 2013-11-05 13:51:32 +00:00 committed by Trevor Saunders
parent 4f94d87c61
commit ecbffdd88f
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/ChangeLog
View File

@ -1,3 +1,12 @@
2013-11-05 Trevor Saunders <tsaunders@mozilla.com>
* vec.c (vec_prefix::calculate_allocation): Don't try to handle the
case of no prefix and reserving zero slots, because when that's the
case we'll never get here.
* vec.h (va_heap::reserve): Don't try and handle
vec_prefix::calculate_allocation returning zero because that should
never happen.
2013-11-05 Richard Biener <rguenther@suse.de> 2013-11-05 Richard Biener <rguenther@suse.de>
PR middle-end/58941 PR middle-end/58941

4
gcc/vec.c
View File

@ -187,9 +187,7 @@ vec_prefix::calculate_allocation (vec_prefix *pfx, unsigned reserve,
num = pfx->m_num; num = pfx->m_num;
} }
else if (!reserve) else if (!reserve)
/* If there's no vector, and we've not requested anything, then we gcc_unreachable ();
will create a NULL vector. */
return 0;
/* We must have run out of room. */ /* We must have run out of room. */
gcc_assert (alloc - num < reserve); gcc_assert (alloc - num < reserve);

6
gcc/vec.h
View File

@ -283,11 +283,7 @@ va_heap::reserve (vec<T, va_heap, vl_embed> *&v, unsigned reserve, bool exact
{ {
unsigned alloc unsigned alloc
= vec_prefix::calculate_allocation (v ? &v->m_vecpfx : 0, reserve, exact); = vec_prefix::calculate_allocation (v ? &v->m_vecpfx : 0, reserve, exact);
if (!alloc) gcc_assert (alloc);
{
release (v);
return;
}
if (GATHER_STATISTICS && v) if (GATHER_STATISTICS && v)
v->m_vecpfx.release_overhead (); v->m_vecpfx.release_overhead ();