OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/14179 (out of memory while parsing array with many initializers) 

PR c++/14179
	* vec.c (vec_gc_o_reserve_1): Use ggc_round_alloc_size.

From-SVN: r183213
This commit is contained in:
Jason Merrill 2012-01-16 11:40:26 -05:00 committed by Jason Merrill
parent 00fbd5c8c7
commit 7aeb037b25
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2012-01-16 Jason Merrill <jason@redhat.com>
PR c++/14179
* vec.c (vec_gc_o_reserve_1): Use ggc_round_alloc_size.
2012-01-16 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/51860

13
gcc/vec.c
View File

@ -221,6 +221,7 @@ vec_gc_o_reserve_1 (void *vec, int reserve, size_t vec_offset, size_t elt_size,
{
struct vec_prefix *pfx = (struct vec_prefix *) vec;
unsigned alloc = calculate_allocation (pfx, reserve, exact);
size_t size;
if (!alloc)
{
@ -229,7 +230,17 @@ vec_gc_o_reserve_1 (void *vec, int reserve, size_t vec_offset, size_t elt_size,
return NULL;
}
vec = ggc_realloc_stat (vec, vec_offset + alloc * elt_size PASS_MEM_STAT);
/* Calculate the amount of space we want. */
size = vec_offset + alloc * elt_size;
/* Ask the allocator how much space it will really give us. */
size = ggc_round_alloc_size (size);
/* Adjust the number of slots accordingly. */
alloc = (size - vec_offset) / elt_size;
/* And finally, recalculate the amount of space we ask for. */
size = vec_offset + alloc * elt_size;
vec = ggc_realloc_stat (vec, size PASS_MEM_STAT);
((struct vec_prefix *)vec)->alloc = alloc;
if (!pfx)
((struct vec_prefix *)vec)->num = 0;