[Patch, Fortran] PR 63363: No diagnostic for passing function as actual argument to KIND

[Patch, Fortran] PR 63363: No diagnostic for passing function as actual argument to KIND

[Janus Weil]

[-- Attachment #1: Type: text/plain, Size: 409 bytes --]

Hi all,

here is a small patch which enhances the diagnostics for the intrinsic
KIND function. Regtested on x86_64-unknown-linux-gnu. Ok for trunk?

Cheers,
Janus



2014-12-22  Janus Weil  <janus@gcc.gnu.org>

    PR fortran/63363
    * check.c (gfc_check_kind): Reject polymorphic and non-data arguments.

2014-12-22  Janus Weil  <janus@gcc.gnu.org>

    PR fortran/63363
    * gfortran.dg/kind_1.f90: New.

[-- Attachment #2: pr63363.diff --]
[-- Type: text/plain, Size: 957 bytes --]

Index: gcc/fortran/check.c
===================================================================
--- gcc/fortran/check.c	(Revision 219014)
+++ gcc/fortran/check.c	(Arbeitskopie)
@@ -2531,13 +2531,20 @@ gfc_check_kill_sub (gfc_expr *pid, gfc_expr *sig,
 bool
 gfc_check_kind (gfc_expr *x)
 {
-  if (x->ts.type == BT_DERIVED)
+  if (x->ts.type == BT_DERIVED || x->ts.type == BT_CLASS)
     {
-      gfc_error ("%qs argument of %qs intrinsic at %L must be a "
-		 "non-derived type", gfc_current_intrinsic_arg[0]->name,
+      gfc_error ("%qs argument of %qs intrinsic at %L must be of "
+		 "intrinsic type", gfc_current_intrinsic_arg[0]->name,
 		 gfc_current_intrinsic, &x->where);
       return false;
     }
+  if (x->ts.type == BT_PROCEDURE)
+    {
+      gfc_error ("%qs argument of %qs intrinsic at %L must be a data entity",
+		 gfc_current_intrinsic_arg[0]->name, gfc_current_intrinsic,
+		 &x->where);
+      return false;
+    }
 
   return true;
 }

[-- Attachment #3: kind_1.f90 --]
[-- Type: text/x-fortran, Size: 608 bytes --]

! { dg-do compile }
!
! PR 63363: No diagnostic for passing function as actual argument to KIND
!
! Contributed by Ian Harvey <ian_harvey@bigpond.com>

  type :: t
  end type
  type(t) :: d
  class(*), allocatable :: c

  print *, KIND(d)    ! { dg-error "must be of intrinsic type" }
  print *, KIND(c)    ! { dg-error "must be of intrinsic type" }

  print *, KIND(f)    ! { dg-error "must be a data entity" }
  print *, KIND(f())
  print *, KIND(s)    ! { dg-error "must be a data entity" }
contains
  FUNCTION f()
    INTEGER(SELECTED_INT_KIND(4)) :: f
  END FUNCTION
  subroutine s
  end subroutine
END

Re: [Patch, Fortran] PR 63363: No diagnostic for passing function as actual argument to KIND

[Steve Kargl]

On Mon, Dec 22, 2014 at 04:48:02PM +0100, Janus Weil wrote:
> 
> here is a small patch which enhances the diagnostics for the intrinsic
> KIND function. Regtested on x86_64-unknown-linux-gnu. Ok for trunk?
> 
> Cheers,
> Janus
> 
> 
> 2014-12-22  Janus Weil  <janus@gcc.gnu.org>
> 
>     PR fortran/63363
>     * check.c (gfc_check_kind): Reject polymorphic and non-data arguments.
> 
> 2014-12-22  Janus Weil  <janus@gcc.gnu.org>
> 
>     PR fortran/63363
>     * gfortran.dg/kind_1.f90: New.


OK.

-- 
Steve

Re: [Patch, Fortran] PR 63363: No diagnostic for passing function as actual argument to KIND

[Janus Weil]

>> here is a small patch which enhances the diagnostics for the intrinsic
>> KIND function. Regtested on x86_64-unknown-linux-gnu. Ok for trunk?
>
> OK.

Thanks, committed as r219027.

Cheers,
Janus