Fortran: F2018 type(*),dimension(*) with scalars [PR104143]

Assumed-size dummy arguments accept arrays and array elements as actual
arguments. There are also a few exceptions when real scalars are permitted.
Since F2018, this includes scalar arguments to assumed-type dummies; while
type(*) was added in TS29113, this change is only in F2018 itself.

	PR fortran/104143

gcc/fortran/ChangeLog:

	* interface.cc (compare_parameter): Permit scalar args to
	'type(*), dimension(*)'.

gcc/testsuite/ChangeLog:

	* gfortran.dg/c-interop/c407b-2.f90: Remove dg-error.
	* gfortran.dg/assumed_type_16.f90: New test.
	* gfortran.dg/assumed_type_17.f90: New test.

(cherry picked from commit 59f6dea963b5f7a6b9ced325200359b4831e7fa7)

diff --git a/gcc/fortran/ChangeLog.omp b/gcc/fortran/ChangeLog.omp
index 8c89cd5bd4379a587e0ba4f6628a6915633e1c9c..923a46312a96b90b4a2f3dadab6be08e9ce86002 100644 (file)
--- a/gcc/fortran/ChangeLog.omp
+++ b/gcc/fortran/ChangeLog.omp
@@ -1,3 +1,12 @@
+2022-09-23  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backport from mainline:
+       2022-09-20  Tobias Burnus  <tobias@codesourcery.com>
+
+       PR fortran/104143
+       * interface.cc (compare_parameter): Permit scalar args to
+       'type(*), dimension(*)'.
+
 2022-09-09  Tobias Burnus  <tobias@codesourcery.com>
 
        Backport from mainline:

diff --git a/gcc/fortran/interface.cc b/gcc/fortran/interface.cc
index 71eec78259bd4feef951dffcffc665a35c8c1301..d3e199535b3b3a8c4fb0b2b3ddca6d82f00cce43 100644 (file)
--- a/gcc/fortran/interface.cc
+++ b/gcc/fortran/interface.cc
@@ -2692,7 +2692,8 @@ compare_parameter (gfc_symbol *formal, gfc_expr *actual,
      - if the actual argument is (a substring of) an element of a
        non-assumed-shape/non-pointer/non-polymorphic array; or
      - (F2003) if the actual argument is of type character of default/c_char
-       kind.  */
+       kind.
+     - (F2018) if the dummy argument is type(*).  */
 
   is_pointer = actual->expr_type == EXPR_VARIABLE
               ? actual->symtree->n.sym->attr.pointer : false;
@@ -2759,6 +2760,14 @@ compare_parameter (gfc_symbol *formal, gfc_expr *actual,
 
   if (ref == NULL && actual->expr_type != EXPR_NULL)
     {
+      if (actual->rank == 0
+         && formal->ts.type == BT_ASSUMED
+         && formal->as
+         && formal->as->type == AS_ASSUMED_SIZE)
+       /* This is new in F2018, type(*) is new in TS29113, but gfortran does
+          not differentiate.  Thus, if type(*) exists, it is valid;
+          otherwise, type(*) is already rejected.  */
+       return true;
       if (where
          && (!formal->attr.artificial || (!formal->maybe_array
                                           && !maybe_dummy_array_arg (actual))))

diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index e0c8c1386208094414718307a863eb5dcd472289..7b085e8254ebce05d60533cdb42635cd3e45b554 100644 (file)
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,13 @@
+2022-09-23  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backport from mainline:
+       2022-09-20  Tobias Burnus  <tobias@codesourcery.com>
+
+       PR fortran/104143
+       * gfortran.dg/c-interop/c407b-2.f90: Remove dg-error.
+       * gfortran.dg/assumed_type_16.f90: New test.
+       * gfortran.dg/assumed_type_17.f90: New test.
+
 2022-09-09  Paul-Antoine Arras  <pa@codesourcery.com>
 
        Backport from mainline:

diff --git a/gcc/testsuite/gfortran.dg/assumed_type_16.f90 b/gcc/testsuite/gfortran.dg/assumed_type_16.f90
new file mode 100644 (file)
index 0000000..52d8ef5
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/assumed_type_16.f90
@@ -0,0 +1,14 @@
+! { dg-do compile }
+! { dg-additional-options "-std=f2008" }
+!
+! PR fortran/104143
+!
+ interface
+   subroutine foo(x)
+     type(*) :: x(*)  ! { dg-error "Fortran 2018: Assumed type" }
+   end
+ end interface
+ integer :: a
+ call foo(a)  ! { dg-error "Type mismatch in argument" }
+ call foo((a))  ! { dg-error "Type mismatch in argument" }
+end

diff --git a/gcc/testsuite/gfortran.dg/assumed_type_17.f90 b/gcc/testsuite/gfortran.dg/assumed_type_17.f90
new file mode 100644 (file)
index 0000000..d6ccd30
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/assumed_type_17.f90
@@ -0,0 +1,18 @@
+! { dg-do compile }
+! { dg-additional-options "-std=f2018 -fdump-tree-original" }
+!
+! PR fortran/104143
+!
+ interface
+   subroutine foo(x)
+     type(*) :: x(*)
+   end
+ end interface
+ integer :: a
+ call foo(a)
+ call foo((a))
+end
+
+! { dg-final { scan-tree-dump-times "foo \\(&a\\);" 1 "original" } }
+! { dg-final { scan-tree-dump-times "D.\[0-9\]+ = a;" 1 "original" } }
+! { dg-final { scan-tree-dump-times "foo \\(&D.\[0-9\]+\\);" 1 "original" } }

diff --git a/gcc/testsuite/gfortran.dg/c-interop/c407b-2.f90 b/gcc/testsuite/gfortran.dg/c-interop/c407b-2.f90
index 4f9f6c73d7d8b84a799c3e26bcd627c95cbcedae..49352fc9d71cfc28d69fe40b6f85bd836757872f 100644 (file)
--- a/gcc/testsuite/gfortran.dg/c-interop/c407b-2.f90
+++ b/gcc/testsuite/gfortran.dg/c-interop/c407b-2.f90
@@ -40,7 +40,7 @@ subroutine s0 (x)
 
   call g (x, 1)
   call f (x, 1)  ! { dg-error "Type mismatch" }
-  call h (x, 1)  ! { dg-error "Rank mismatch" }
+  call h (x, 1)  ! Scalar to type(*),dimension(*): Invalid in TS29113 but valid since F2018
 end subroutine
 
 ! Check that you can't use an assumed-type array variable in an array