diff options
| author | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-06-17 19:31:06 +0000 |
|---|---|---|
| committer | burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-06-17 19:31:06 +0000 |
| commit | 8e882a1674e70cdea3bf8630a7613fe2bf12e52d (patch) | |
| tree | 3580b7403687d7d146efbcceecee9d57deff3d8f /libgfortran/generated/minloc1_4_i1.c | |
| parent | fade5ce98b583fa416ba84b4cc3cad12af227f57 (diff) | |
| parent | 634a5ad7fc8a4498978609c4e523b29658affa22 (diff) | |
| download | gcc-8e882a1674e70cdea3bf8630a7613fe2bf12e52d.tar.gz | |
2014-06-17 Tobias Burnus <burnus@net-b.de>
* Merge from the trunk to r211744.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/fortran-dev@211745 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgfortran/generated/minloc1_4_i1.c')
| -rw-r--r-- | libgfortran/generated/minloc1_4_i1.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/libgfortran/generated/minloc1_4_i1.c b/libgfortran/generated/minloc1_4_i1.c index 024668e8f15..b71337b6745 100644 --- a/libgfortran/generated/minloc1_4_i1.c +++ b/libgfortran/generated/minloc1_4_i1.c @@ -99,10 +99,9 @@ minloc1_4_i1 (gfc_array_i4 * const restrict retarray, retarray->elem_len = array->elem_len; retarray->type = array->type; - alloc_size = GFC_DESCRIPTOR_SM (retarray, rank-1) - * extent[rank-1]; + alloc_size = GFC_DESCRIPTOR_SM (retarray, rank-1) * extent[rank-1]; - retarray->base_addr = xmalloc (alloc_size); + retarray->base_addr = xmallocarray (alloc_size, sizeof (GFC_INTEGER_4)); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -295,8 +294,7 @@ mminloc1_4_i1 (gfc_array_i4 * const restrict retarray, } - alloc_size = GFC_DESCRIPTOR_SM (retarray, rank-1) - * extent[rank-1]; + alloc_size = GFC_DESCRIPTOR_SM (retarray, rank-1) * extent[rank-1]; retarray->offset = 0; retarray->elem_len = array->elem_len; @@ -309,7 +307,7 @@ mminloc1_4_i1 (gfc_array_i4 * const restrict retarray, return; } else - retarray->base_addr = xmalloc (alloc_size); + retarray->base_addr = xmallocarray (alloc_size, sizeof (GFC_INTEGER_4)); } else @@ -487,8 +485,7 @@ sminloc1_4_i1 (gfc_array_i4 * const restrict retarray, retarray->type = array->type; retarray->offset = 0; - alloc_size = GFC_DESCRIPTOR_SM (retarray, rank-1) - * extent[rank-1]; + alloc_size = GFC_DESCRIPTOR_SM (retarray, rank-1) * extent[rank-1]; if (alloc_size == 0) { @@ -497,7 +494,7 @@ sminloc1_4_i1 (gfc_array_i4 * const restrict retarray, return; } else - retarray->base_addr = xmalloc (alloc_size); + retarray->base_addr = xmallocarray (alloc_size, sizeof (GFC_INTEGER_4)); } else { |