PR fortran/29600

	* Makefile.am: Add generated/shape_i{1,2}.c
	* Makefile.in: Regenerate.
	* generated/shape_i1.c: New generated file.
	* generated/shape_i2.c: New generated file.
	* generated/shape_i4.c: Regenerate.
	* generated/shape_i8.c: Regenerate.
	* generated/shape_i16.c: Regenerate.
	* gfortran.map (GFORTRAN_1.7): Add _gfortran_shape_{1,2}.
	* m4/shape.m4: Fix parameter type.

	* gfortran.dg/shape_8.f90: New test.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@227210 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 140 insertions, 6 deletions

diff --git a/libgfortran/generated/shape_i1.c b/libgfortran/generated/shape_i1.c
new file mode 100644
index 00000000000..6ac8e14c9b9
--- /dev/null
+++ b/libgfortran/generated/shape_i1.c
@@ -0,0 +1,67 @@
+/* Implementation of the SHAPE intrinsic
+   Copyright (C) 2002-2015 Free Software Foundation, Inc.
+   Contributed by Paul Brook <paul@nowt.org>
+
+This file is part of the GNU Fortran runtime library (libgfortran).
+
+Libgfortran is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public
+License as published by the Free Software Foundation; either
+version 3 of the License, or (at your option) any later version.
+
+Libgfortran is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.
+
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+<http://www.gnu.org/licenses/>.  */
+
+#include "libgfortran.h"
+#include <stdlib.h>
+#include <assert.h>
+
+
+#if defined (HAVE_GFC_INTEGER_1)
+
+extern void shape_1 (gfc_array_i1 * const restrict ret, 
+	const array_t * const restrict array);
+export_proto(shape_1);
+
+void
+shape_1 (gfc_array_i1 * const restrict ret, 
+	const array_t * const restrict array)
+{
+  int n;
+  index_type stride;
+  index_type extent;
+  int rank;
+
+  rank = GFC_DESCRIPTOR_RANK (array);
+
+  if (ret->base_addr == NULL)
+    {
+      GFC_DIMENSION_SET(ret->dim[0], 0, rank - 1, 1);
+      ret->offset = 0;
+      ret->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_1));
+    }
+
+  stride = GFC_DESCRIPTOR_STRIDE(ret,0);
+
+  if (GFC_DESCRIPTOR_EXTENT(ret,0) < 1)
+    return;
+
+  for (n = 0; n < rank; n++)
+    {
+      extent = GFC_DESCRIPTOR_EXTENT(array,n);
+      ret->base_addr[n * stride] = extent > 0 ? extent : 0 ;
+    }
+}
+
+#endif
diff --git a/libgfortran/generated/shape_i16.c b/libgfortran/generated/shape_i16.c
index a9cb8a25b8e..4cb43c8b5b1 100644
--- a/libgfortran/generated/shape_i16.c
+++ b/libgfortran/generated/shape_i16.c
@@ -31,12 +31,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #if defined (HAVE_GFC_INTEGER_16)
 
 extern void shape_16 (gfc_array_i16 * const restrict ret, 
-	const gfc_array_i16 * const restrict array);
+	const array_t * const restrict array);
 export_proto(shape_16);
 
 void
 shape_16 (gfc_array_i16 * const restrict ret, 
-	const gfc_array_i16 * const restrict array)
+	const array_t * const restrict array)
 {
   int n;
   index_type stride;
diff --git a/libgfortran/generated/shape_i2.c b/libgfortran/generated/shape_i2.c
new file mode 100644
index 00000000000..982d9ccd92f
--- /dev/null
+++ b/libgfortran/generated/shape_i2.c
@@ -0,0 +1,67 @@
+/* Implementation of the SHAPE intrinsic
+   Copyright (C) 2002-2015 Free Software Foundation, Inc.
+   Contributed by Paul Brook <paul@nowt.org>
+
+This file is part of the GNU Fortran runtime library (libgfortran).
+
+Libgfortran is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public
+License as published by the Free Software Foundation; either
+version 3 of the License, or (at your option) any later version.
+
+Libgfortran is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.
+
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+<http://www.gnu.org/licenses/>.  */
+
+#include "libgfortran.h"
+#include <stdlib.h>
+#include <assert.h>
+
+
+#if defined (HAVE_GFC_INTEGER_2)
+
+extern void shape_2 (gfc_array_i2 * const restrict ret, 
+	const array_t * const restrict array);
+export_proto(shape_2);
+
+void
+shape_2 (gfc_array_i2 * const restrict ret, 
+	const array_t * const restrict array)
+{
+  int n;
+  index_type stride;
+  index_type extent;
+  int rank;
+
+  rank = GFC_DESCRIPTOR_RANK (array);
+
+  if (ret->base_addr == NULL)
+    {
+      GFC_DIMENSION_SET(ret->dim[0], 0, rank - 1, 1);
+      ret->offset = 0;
+      ret->base_addr = xmallocarray (rank, sizeof (GFC_INTEGER_2));
+    }
+
+  stride = GFC_DESCRIPTOR_STRIDE(ret,0);
+
+  if (GFC_DESCRIPTOR_EXTENT(ret,0) < 1)
+    return;
+
+  for (n = 0; n < rank; n++)
+    {
+      extent = GFC_DESCRIPTOR_EXTENT(array,n);
+      ret->base_addr[n * stride] = extent > 0 ? extent : 0 ;
+    }
+}
+
+#endif
diff --git a/libgfortran/generated/shape_i4.c b/libgfortran/generated/shape_i4.c
index 04654eae76d..8a912b35b9f 100644
--- a/libgfortran/generated/shape_i4.c
+++ b/libgfortran/generated/shape_i4.c
@@ -31,12 +31,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #if defined (HAVE_GFC_INTEGER_4)
 
 extern void shape_4 (gfc_array_i4 * const restrict ret, 
-	const gfc_array_i4 * const restrict array);
+	const array_t * const restrict array);
 export_proto(shape_4);
 
 void
 shape_4 (gfc_array_i4 * const restrict ret, 
-	const gfc_array_i4 * const restrict array)
+	const array_t * const restrict array)
 {
   int n;
   index_type stride;
diff --git a/libgfortran/generated/shape_i8.c b/libgfortran/generated/shape_i8.c
index 7b0988875c0..d33add63e47 100644
--- a/libgfortran/generated/shape_i8.c
+++ b/libgfortran/generated/shape_i8.c
@@ -31,12 +31,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #if defined (HAVE_GFC_INTEGER_8)
 
 extern void shape_8 (gfc_array_i8 * const restrict ret, 
-	const gfc_array_i8 * const restrict array);
+	const array_t * const restrict array);
 export_proto(shape_8);
 
 void
 shape_8 (gfc_array_i8 * const restrict ret, 
-	const gfc_array_i8 * const restrict array)
+	const array_t * const restrict array)
 {
   int n;
   index_type stride;