[Patch, Fortran, Regression] PR 48059: ICE in in gfc_conv_component_ref: character function of extended type

[Patch, Fortran, Regression] PR 48059: ICE in in gfc_conv_component_ref: character function of extended type

[Janus Weil]

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

Hi all,

the attached patch fixes the PR in the subject line. The problem was
the following: During the interface mapping for a procedure call we
need to take special care of polymorphic arguments, since the type of
the actual argument can differ from the type of the formal argument.
Therefore we need to replace the base type of component references by
the actual type (in particular to get parent references right).

The patch was regtested on x86_64-unknown-linux-gnu. Ok for trunk?

Cheers,
Janus


2011-03-12  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/48059
	* trans-expr.c (gfc_apply_interface_mapping_to_expr): Replace base type
	for polymorphic arguments.

2011-03-12  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/48059
	* gfortran.dg/class_41.f03: New.

[-- Attachment #2: pr48059.diff --]
[-- Type: text/x-diff, Size: 653 bytes --]

Index: gcc/fortran/trans-expr.c
===================================================================
--- gcc/fortran/trans-expr.c	(revision 170879)
+++ gcc/fortran/trans-expr.c	(working copy)
@@ -2247,6 +2247,10 @@ gfc_apply_interface_mapping_to_expr (gfc_interface
 	  expr->symtree = sym->new_sym;
 	else if (sym->expr)
 	  gfc_replace_expr (expr, gfc_copy_expr (sym->expr));
+	/* Replace base type for polymorphic arguments.  */
+	if (expr->ref && expr->ref->type == REF_COMPONENT
+	    && sym->expr && sym->expr->ts.type == BT_CLASS)
+	  expr->ref->u.c.sym = sym->expr->ts.u.derived;
       }
 
       /* ...and to subexpressions in expr->value.  */

[-- Attachment #3: class_41.f03 --]
[-- Type: application/octet-stream, Size: 664 bytes --]

! { dg-do compile }
!
! PR 48059: [4.6 Regression][OOP] ICE in in gfc_conv_component_ref: character function of extended type
!
! Contributed by Hans-Werner Boschmann <boschmann@tp1.physik.uni-siegen.de>

module a_module
  type :: a_type
     integer::length=0
  end type a_type
  type,extends(a_type) :: b_type
  end type b_type
contains
  function a_string(this) result(form)
    class(a_type),intent(in)::this
    character(max(1,this%length))::form
  end function a_string
  subroutine b_sub(this)
    class(b_type),intent(inout),target::this
    print *,a_string(this)
  end subroutine b_sub
end module a_module

! { dg-final { cleanup-modules "a_module" } }

Re: [Patch, Fortran, Regression] PR 48059: ICE in in gfc_conv_component_ref: character function of extended type

[Paul Richard Thomas]

Janus,

> The patch was regtested on x86_64-unknown-linux-gnu. Ok for trunk?
>

Yes, as discussed off-list, it looks OK to me.  Get it committed asap!

Thanks for the patch

Paul


>
>
> 2011-03-12  Janus Weil  <janus@gcc.gnu.org>
>
>        PR fortran/48059
>        * trans-expr.c (gfc_apply_interface_mapping_to_expr): Replace base type
>        for polymorphic arguments.
>
> 2011-03-12  Janus Weil  <janus@gcc.gnu.org>
>
>        PR fortran/48059
>        * gfortran.dg/class_41.f03: New.
>



-- 
The knack of flying is learning how to throw yourself at the ground and miss.
       --Hitchhikers Guide to the Galaxy

Re: [Patch, Fortran, Regression] PR 48059: ICE in in gfc_conv_component_ref: character function of extended type

[Jerry DeLisle]

On 03/12/2011 03:16 AM, Janus Weil wrote:
> Hi all,
>
> the attached patch fixes the PR in the subject line. The problem was
> the following: During the interface mapping for a procedure call we
> need to take special care of polymorphic arguments, since the type of
> the actual argument can differ from the type of the formal argument.
> Therefore we need to replace the base type of component references by
> the actual type (in particular to get parent references right).
>
> The patch was regtested on x86_64-unknown-linux-gnu. Ok for trunk?
>

Yes, thanks for patch!

Jerry

Re: [Patch, Fortran, Regression] PR 48059: ICE in in gfc_conv_component_ref: character function of extended type

[Janus Weil]

>> The patch was regtested on x86_64-unknown-linux-gnu. Ok for trunk?
>>
>
> Yes, as discussed off-list, it looks OK to me.  Get it committed asap!

Thanks. Committed as r170906.

Cheers,
Janus