re PR fortran/83939 (Constraint C1290 (elemental function cannot be allocatable)...

2018-03-11  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/83939
	* resolve.c (resolve_fl_procedure): Enforce F2018:C15100.

2018-03-11  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/83939
	* gfortran.dg/pr83939.f90

From-SVN: r258437

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 68e4f38bb8516a2ac24a81c81a845130f7eb55c3..45def3230da3a3abd11b2719472e08d95747a9a2 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+
+2018-03-11  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/83939
+       * resolve.c (resolve_fl_procedure): Enforce F2018:C15100.
+
 2018-03-11  Steven G. Kargl  <kargls@gcc.gnu.org>
 
        * check.c (gfc_check_kill):  Check pid and sig are scalar.

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 6e20184e648f7327ccf488fd1048f8dd7052b3e4..e28146a8bf46689d639c46616b0a40f426093012 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -12451,6 +12451,19 @@ resolve_fl_procedure (gfc_symbol *sym, int mp_flag)
        }
     }
 
+  /* F2018, C15100: "The result of an elemental function shall be scalar,
+     and shall not have the POINTER or ALLOCATABLE attribute."  The scalar
+     pointer is tested and caught elsewhere.  */
+  if (sym->attr.elemental && sym->result
+      && (sym->result->attr.allocatable || sym->result->attr.pointer))
+    {
+      gfc_error ("Function result variable %qs at %L of elemental "
+                "function %qs shall not have an ALLOCATABLE or POINTER "
+                "attribute", sym->result->name,
+                &sym->result->declared_at, sym->name);
+      return false;
+    }
+
   if (sym->attr.is_bind_c && sym->attr.is_c_interop != 1)
     {
       gfc_formal_arglist *curr_arg;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4f7a81663e637d3763459c04ad1e159e0aa11e21..c089a1dc2731feac9fcbc707e2549bd1e8f21e34 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-11  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/83939
+       * gfortran.dg/pr83939.f90
+
 2018-03-11  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
        PR fortran/66128

diff --git a/gcc/testsuite/gfortran.dg/pr83939.f90 b/gcc/testsuite/gfortran.dg/pr83939.f90
new file mode 100644 (file)
index 0000000..dfeaac7
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr83939.f90
@@ -0,0 +1,12 @@
+! { dg-do compile }
+elemental function f() result(s) ! { dg-error "shall not have an ALLOCATABLE or POINTER" }
+  allocatable s
+  allocate(s)
+  s = 3.5
+end function
+
+elemental function g() result(s) ! { dg-error "shall not have an ALLOCATABLE or POINTER" }
+  pointer s
+  allocate(s)
+  s = 3.5
+end function