diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2014-06-06 22:37:27 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2014-06-06 22:37:27 +0000 |
| commit | 6736ef96eab222e58e6294f42be981a5afb59811 (patch) | |
| tree | 2bc668fae9bf96f9a3988e0b0a16685bde8c4f0b /libgo/runtime/go-append.c | |
| parent | 38a138411da4206c53f9a153ee9c3624fce58a52 (diff) | |
| download | gcc-6736ef96eab222e58e6294f42be981a5afb59811.zip gcc-6736ef96eab222e58e6294f42be981a5afb59811.tar.gz gcc-6736ef96eab222e58e6294f42be981a5afb59811.tar.bz2 | |
libgo: Merge to master revision 19184.
The next revision, 19185, renames several runtime files, and
will be handled in a separate change.
From-SVN: r211328
Diffstat (limited to 'libgo/runtime/go-append.c')
| -rw-r--r-- | libgo/runtime/go-append.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libgo/runtime/go-append.c b/libgo/runtime/go-append.c index 8d5dee2..1b2d49e 100644 --- a/libgo/runtime/go-append.c +++ b/libgo/runtime/go-append.c @@ -37,6 +37,7 @@ __go_append (struct __go_open_array a, void *bvalues, uintptr_t bcount, if (count > a.__capacity) { intgo m; + uintptr capmem; void *n; m = a.__capacity; @@ -57,7 +58,9 @@ __go_append (struct __go_open_array a, void *bvalues, uintptr_t bcount, if (element_size > 0 && (uintptr) m > MaxMem / element_size) runtime_panicstring ("growslice: cap out of range"); - n = __go_alloc (m * element_size); + capmem = runtime_roundupsize (m * element_size); + + n = __go_alloc (capmem); __builtin_memcpy (n, a.__values, a.__count * element_size); a.__values = n; |