[Patch, fortran] pr77358 - [F08] deferred-length character function returns zero-length string

[Patch, fortran] pr77358 - [F08] deferred-length character function returns zero-length string

[Paul Richard Thomas]

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

Dear All,

The attached fixes this problem, bootstraps and regtests on FC21/x86_64.

OK for 6-branch and trunk?

Paul

2016-08-24  Paul Thomas  <pault@gcc.gnu.org>

    PR fortran/77358

    * resolve.c (resolve_fl_procedure): Use the correct gfc_charlen
    for deferred character length module procedures.

2016-08-24  Paul Thomas  <pault@gcc.gnu.org>

    PR fortran/77358
    * gfortran.dg/submodule_17.f08: New test.

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

Index: gcc/fortran/resolve.c
===================================================================
*** gcc/fortran/resolve.c	(revision 238840)
--- gcc/fortran/resolve.c	(working copy)
*************** resolve_fl_procedure (gfc_symbol *sym, i
*** 11961,11966 ****
--- 11961,11973 ----
        iface = sym->ts.interface;
        sym->ts.interface = NULL;
  
+       /* Make sure that the result uses the correct charlen for deferred
+ 	 length results.  */
+       if (iface && sym->result
+ 	  && iface->ts.type == BT_CHARACTER
+ 	  && iface->ts.deferred)
+ 	sym->result->ts.u.cl = iface->ts.u.cl;
+ 
        if (iface == NULL)
  	goto check_formal;
  
Index: gcc/testsuite/gfortran.dg/submodule_17.f08
===================================================================
*** gcc/testsuite/gfortran.dg/submodule_17.f08	(revision 0)
--- gcc/testsuite/gfortran.dg/submodule_17.f08	(working copy)
***************
*** 0 ****
--- 1,27 ----
+ ! { dg-do run }
+ !
+ ! Tests the fix for PR77358, in which the wrong gfc_charlen was
+ ! being used for the result of 'get'.
+ !
+ ! Contributed by Damian Rouson  <damian@sourceryinstitute.org>
+ !
+ module hello_interface
+   character(len=13) :: string="Hello, world!"
+   interface
+     module function get() result(result_string)
+       character(:), allocatable :: result_string
+     end function
+   end interface
+ end module
+ 
+ submodule(hello_interface) hello_implementation
+ contains
+   module function get() result(result_string)
+     character(:), allocatable :: result_string
+     result_string = string
+   end function
+ end submodule
+ 
+   use hello_interface
+   if (get() .ne. string) call abort
+ end

Re: [Patch, fortran] pr77358 - [F08] deferred-length character function returns zero-length string

[Tobias Burnus]

Dear Paul,

Paul Richard Thomas wrote:
> The attached fixes this problem, bootstraps and regtests on FC21/x86_64.
> OK for 6-branch and trunk?

Looks good to me. Thanks for the patch.

Tobias

> 2016-08-24  Paul Thomas  <pault@gcc.gnu.org>
> 
>     PR fortran/77358
> 
>     * resolve.c (resolve_fl_procedure): Use the correct gfc_charlen

There shouldn't be a space between the PR line and the rest.
> 
>     PR fortran/77358
>     * gfortran.dg/submodule_17.f08: New test.

Re: [Patch, fortran] pr77358 - [F08] deferred-length character function returns zero-length string

[Paul Richard Thomas]

Dear Tobias,

Committed to trunk as revision 239740. 6-branch to follow.

Thanks for the review.

Best regards

Paul

Re: [Patch, fortran] pr77358 - [F08] deferred-length character function returns zero-length string

[Paul Richard Thomas]

...and to 6-branch as revision 239741.

Cheers

Paul

On 24 August 2016 at 21:41, Paul Richard Thomas
<paul.richard.thomas@gmail.com> wrote:
> Dear Tobias,
>
> Committed to trunk as revision 239740. 6-branch to follow.
>
> Thanks for the review.
>
> Best regards
>
> Paul



-- 
The difference between genius and stupidity is; genius has its limits.

Albert Einstein