diff options
| author | Rong Xu <xur@google.com> | 2014-08-06 17:50:42 -0700 |
|---|---|---|
| committer | Rong Xu <xur@google.com> | 2014-08-06 17:50:42 -0700 |
| commit | f1c18afafc2b321465ae6b07ede127095942d7dc (patch) | |
| tree | 812093eebfa8510367718c12c02f7da03c0e73bf /gcc-4.9/libgfortran/intrinsics/spread_generic.c | |
| parent | 38a8aecfb882072900434499696b5c32a2274515 (diff) | |
| download | toolchain_gcc-f1c18afafc2b321465ae6b07ede127095942d7dc.tar.gz toolchain_gcc-f1c18afafc2b321465ae6b07ede127095942d7dc.tar.bz2 toolchain_gcc-f1c18afafc2b321465ae6b07ede127095942d7dc.zip | |
[gcc-4.9] Merge svn r213650 from google/gcc-4_9 branch
Merge svn r213650 from google/gcc-4_9 branch. Tested with
arm,x86,mips,arm64,x86_64,mips64 build in liunux/windows.
Change-Id: I0c07f67d516074172aa393003eee664d01f2e0f2
Diffstat (limited to 'gcc-4.9/libgfortran/intrinsics/spread_generic.c')
| -rw-r--r-- | gcc-4.9/libgfortran/intrinsics/spread_generic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc-4.9/libgfortran/intrinsics/spread_generic.c b/gcc-4.9/libgfortran/intrinsics/spread_generic.c index 0fe5722f1..f3f23b8ce 100644 --- a/gcc-4.9/libgfortran/intrinsics/spread_generic.c +++ b/gcc-4.9/libgfortran/intrinsics/spread_generic.c @@ -100,7 +100,7 @@ spread_internal (gfc_array_char *ret, const gfc_array_char *source, GFC_DIMENSION_SET(ret->dim[n], 0, ub, stride); } ret->offset = 0; - ret->base_addr = xmalloc (rs * size); + ret->base_addr = xmallocarray (rs, size); if (rs <= 0) return; @@ -245,7 +245,7 @@ spread_internal_scalar (gfc_array_char *ret, const char *source, if (ret->base_addr == NULL) { - ret->base_addr = xmalloc (ncopies * size); + ret->base_addr = xmallocarray (ncopies, size); ret->offset = 0; GFC_DIMENSION_SET(ret->dim[0], 0, ncopies - 1, 1); } |