Patchwork [fortran] PR45081 - [4.3/4.4/4.5/4.6 Regression] ICE in gfc_conv_array_initializer, at fortran/trans-array.c:4208

login
register
mail settings
Submitter Paul Richard Thomas
Date Sept. 20, 2010, 9:27 p.m.
Message ID <AANLkTikMxxk12uMaGXeOdMdQPuM6TLh9iwfcCB6_uOv7@mail.gmail.com>
Download mbox | patch
Permalink /patch/65255/
State New
Headers show

Comments

Paul Richard Thomas - Sept. 20, 2010, 9:27 p.m.
Dear Mikael,

Thanks for the review.

sted for.
>>
>> Bootstrapped and regtested on FC9/x86_64 - OK for trunk?
> OK.
>
>> How far back
>> to I fix the regression?
> If it is a 4.3/4.4/4.5/4.6 regression, I would say fix on all branches.
> But if you don't have the courage/feel it's not worth it, you can stop on 4.4
> or 4.5.
> From my point of view having the fix on:
>  - 4.5 is mandatory (PR has target milestone 4.5.2),
>  - 4.4 is nice to have,
>  - 4.3 is optional.

Trunk was committed as r164448.  4.5 needed a rework of the patch; see
attached.  Committed as r164457.

I'll do 4.3 and 4.4 tomorrow.

Cheers

Paul

Patch

Index: gcc/fortran/simplify.c
===================================================================
*** gcc/fortran/simplify.c	(revision 164448)
--- gcc/fortran/simplify.c	(working copy)
*************** is_constant_array_expr (gfc_expr *e)
*** 228,234 ****
      return false;
  
    for (c = e->value.constructor; c; c = c->next)
!     if (c->expr->expr_type != EXPR_CONSTANT)
        return false;
  
    return true;
--- 228,235 ----
      return false;
  
    for (c = e->value.constructor; c; c = c->next)
!     if (c->expr->expr_type != EXPR_CONSTANT
! 	  && c->expr->expr_type != EXPR_STRUCTURE)
        return false;
  
    return true;
*************** gfc_simplify_pack (gfc_expr *array, gfc_
*** 4023,4028 ****
--- 4024,4031 ----
  
    if (array->ts.type == BT_CHARACTER)
      result->ts.u.cl = array->ts.u.cl;
+   else if (array->ts.type == BT_DERIVED)
+     result->ts.u.derived = array->ts.u.derived;
  
    return result;
  }
*************** inc:
*** 4472,4477 ****
--- 4475,4485 ----
    e->ts = source->ts;
    e->rank = rank;
  
+   if (source->ts.type == BT_CHARACTER)
+     e->ts.u.cl = source->ts.u.cl;
+   else if (source->ts.type == BT_DERIVED)
+     e->ts.u.derived = source->ts.u.derived;
+ 
    return e;
  }
  
*************** gfc_simplify_spread (gfc_expr *source, g
*** 5158,5163 ****
--- 5166,5173 ----
  
    if (source->ts.type == BT_CHARACTER)
      result->ts.u.cl = source->ts.u.cl;
+   else if (source->ts.type == BT_DERIVED)
+     result->ts.u.derived = source->ts.u.derived;
  
    return result;
  }
*************** gfc_simplify_transpose (gfc_expr *matrix
*** 5420,5425 ****
--- 5430,5437 ----
  
    if (matrix->ts.type == BT_CHARACTER)
      result->ts.u.cl = matrix->ts.u.cl;
+   else if (matrix->ts.type == BT_DERIVED)
+     result->ts.u.derived = matrix->ts.u.derived;
  
    matrix_rows = mpz_get_si (matrix->shape[0]);
    matrix_ctor = matrix->value.constructor;
*************** gfc_simplify_unpack (gfc_expr *vector, g
*** 5503,5508 ****
--- 5515,5522 ----
  
    if (vector->ts.type == BT_CHARACTER)
      result->ts.u.cl = vector->ts.u.cl;
+   else if (vector->ts.type == BT_DERIVED)
+     result->ts.u.derived = vector->ts.u.derived;
  
    vector_ctor = vector->value.constructor;
    mask_ctor = mask->value.constructor;
Index: gcc/testsuite/gfortran.dg/derived_array_intrinisics_1.f90
===================================================================
*** gcc/testsuite/gfortran.dg/derived_array_intrinisics_1.f90	(revision 0)
--- gcc/testsuite/gfortran.dg/derived_array_intrinisics_1.f90	(revision 0)
***************
*** 0 ****
--- 1,30 ----
+ ! { dg-do compile }
+ ! { dg-options "-fdump-tree-original" }
+ ! Test the fix for PR45081 in which derived type array valued intrinsics failed
+ ! to simplify, which caused an ICE in trans-array.c
+ !
+ ! Contributed by Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
+ ! 
+   module m
+     implicit none
+     integer :: i
+     type t
+       integer :: i
+     end type t
+     type(t), dimension(4), parameter :: t1  = [( t(i), i = 1, 4)]
+     type(t), dimension(4), parameter :: t2  = [( t(i), i = 8, 11)]
+     type(t), dimension(2,2), parameter :: a = reshape ( t1, [ 2, 2 ] )
+     type(t), dimension(2,2), parameter :: b = transpose (a)
+     type(t), dimension(4), parameter :: c = reshape ( b, [ 4 ] )
+     type(t), dimension(2), parameter :: d = pack ( c, [.false.,.true.,.false.,.true.])
+     type(t), dimension(4), parameter :: e = unpack (d, [.false.,.true.,.false.,.true.], t2)
+     type(t), dimension(4,2), parameter :: f = spread (e, 2, 2)
+     type(t), dimension(8), parameter :: g = reshape ( f, [ 8 ] )
+     integer, parameter :: total = sum(g%i)
+   end module m
+ 
+     use m
+     integer :: j
+     j = total
+   end
+ ! { dg-final { scan-tree-dump-times "j = 50" 1 "original" } }