[Patch, fortran] PR98897 - Erroneous procedure attribute for associate name

[Paul Richard Thomas <paul.richard.thomas@gmail.com>]

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

This is more or less 'obvious' and does not require any further explanation.

Regtests with FC33/x86_64 - OK for master (and ....)?

Paul

Fortran: Fix calls to associate name typebound subroutines [PR98897].

2021-02-02  Paul Thomas  <pault@gcc.gnu.org>

gcc/fortran
PR fortran/98897
* match.c (gfc_match_call): Include associate names as possible
entities with typebound subroutines. The target needs to be
resolved for the type.

gcc/testsuite/
PR fortran/98897
* gfortran.dg/typebound_call_32.f90: New test.

[-- Attachment #2: submit.diff --]
[-- Type: text/x-patch, Size: 1070 bytes --]

diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index f0469e25da6..2df6191d7e6 100644
--- a/gcc/fortran/match.c
+++ b/gcc/fortran/match.c
@@ -4999,10 +4999,16 @@ gfc_match_call (void)
   sym = st->n.sym;
 
   /* If this is a variable of derived-type, it probably starts a type-bound
-     procedure call.  */
-  if ((sym->attr.flavor != FL_PROCEDURE
-       || gfc_is_function_return_value (sym, gfc_current_ns))
-      && (sym->ts.type == BT_DERIVED || sym->ts.type == BT_CLASS))
+     procedure call. Associate variable targets have to be resolved for the
+     target type.  */
+  if (((sym->attr.flavor != FL_PROCEDURE
+	|| gfc_is_function_return_value (sym, gfc_current_ns))
+       && (sym->ts.type == BT_DERIVED || sym->ts.type == BT_CLASS))
+		||
+      (sym->assoc && sym->assoc->target
+       && gfc_resolve_expr (sym->assoc->target)
+       && (sym->assoc->target->ts.type == BT_DERIVED
+	   || sym->assoc->target->ts.type == BT_CLASS)))
     return match_typebound_call (st);
 
   /* If it does not seem to be callable (include functions so that the

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

! { dg-do run }
!
! Test the fix for PR98897 in which typebound subroutines of associate names
! were not recognised in a call. Functions were OK but this is tested below.
!
! Contributed by Damian Rouson  <damian@sourceryinstitute.org>
!
module output_data_m
  implicit none

  type output_data_t
    integer, private :: i = 0
  contains
    procedure output, return_value
  end type


contains
  subroutine output(self)
      implicit none
      class(output_data_t) self
      self%i = 1234
  end subroutine

  integer function return_value(self)
      implicit none
      class(output_data_t) self
      return_value = self%i
  end function
end module

  use output_data_m
  implicit none
  associate(output_data => output_data_t())
    call output_data%output
    if (output_data%return_value() .ne. 1234) stop 1
  end associate
end