diff mbox

[Fortran] Fix PR 66041

Message ID 554E8AB6.7000101@netcologne.de
State New
Headers show

Commit Message

Thomas Koenig May 9, 2015, 10:31 p.m. UTC 
Am 09.05.2015 um 13:59 schrieb Mikael Morin:

> You also need to remove/free the trailing subreferences.

That's right, I did that.  Although I will probably never understand
why lbound(a) should be different from lbound(a%r)...

>> +		      /* We have to get rid of the shape, if thre is one.  Do
>> +			 so by freeing it and calling gfc_resolve to rebuild it,
>> +			 if necessary.  */
>> +			 
>> +		      if (lbound_e->shape)
>> +			gfc_free_shape (&(lbound_e->shape), lbound_e->rank);
>> +
> 
>> +		      lbound_e->rank = ar->dimen;
> ar->dimen is  not what you think it is.
> It is 3 for array(1, 1, :), while the rank is 1.

> gfc_resolve_expr should set the rank for you, so just remove this line.

It doesn't (for whatever reason), so I kept on setting it.

>> +			
>> +		      gfc_resolve_expr (lbound_e);
>> +		      lbound = get_array_inq_function (GFC_ISYM_LBOUND,
>> +						       lbound_e, i + 1);
> free lbound_e?

It will be part of the lbound expression, or be simplified away.

> 
>>  		    }
>> -		  lbound = get_array_inq_function (GFC_ISYM_LBOUND, e_in,
>> -						   i_index + 1);
>> +		  else
>> +		    lbound = get_array_inq_function (GFC_ISYM_LBOUND, e_in,
>> +						     i_index + 1);
> You can't reuse e_in if it has subreferences.

Changed.

>>  		}
>>  	      
>>  	      ar->dimen_type[i] = DIMEN_ELEMENT;
>> @@ -2639,6 +2665,8 @@ scalarized_expr (gfc_expr *e_in, gfc_expr **index,
>>  	  i_index ++;
>>  	}
>>      }
>> +  gfc_free_expr (e_in);
>> +
> This side effect is asking for trouble.
> Instead of this, remove the copies made in the callers.
> This is independant from the rest, so it can be made later as a follow-up.

Done (all in once).

I have attached the new patch (in which I also restructured the test),
plus the test cases.

OK for trunk?

	Thomas

2015-05-08  Thomas Koenig  <tkoenig@gcc.gnu.org>

        PR fortran/66041
        * frontend-passes.c (scalarized_expr): Copy first argument so it
        is not necessary to call gfc_copy_expr() on its argument.  Set
        correct dimension and shape for the expression to be passed to
        lbound. Remove trailing references after array refrence.
        (inline_matmul_assign):  Remove gfc_copy_expr() from calls
        to scalarized_expr().

2015-05-08  Thomas Koenig  <tkoenig@gcc.gnu.org>

        PR fortran/66041
        * gfortran.dg/inline_matmul_7.f90:  New test.
        * gfortran.dg/inline_matmul_8.f90:  New test.
        * gfortran.dg/inline_matmul_9.f90:  New test.

Comments

Mikael Morin May 10, 2015, 1:30 p.m. UTC | #1 
Hello,

Le 10/05/2015 00:31, Thomas Koenig a écrit :
> Am 09.05.2015 um 13:59 schrieb Mikael Morin:
>>> +		      /* We have to get rid of the shape, if thre is one.  Do
>>> +			 so by freeing it and calling gfc_resolve to rebuild it,
>>> +			 if necessary.  */
>>> +			 
>>> +		      if (lbound_e->shape)
>>> +			gfc_free_shape (&(lbound_e->shape), lbound_e->rank);
>>> +
>>
>>> +		      lbound_e->rank = ar->dimen;
>> ar->dimen is  not what you think it is.
>> It is 3 for array(1, 1, :), while the rank is 1.
> 
>> gfc_resolve_expr should set the rank for you, so just remove this line.
> 
> It doesn't (for whatever reason), so I kept on setting it.
It seems to work here.
In fact ar->dimen is the correct setting here, as the array is full.
But it will be overwritten (by the same value) in gfc_resolve_expr.
Anyway, it doesn't matter.

> 
>>> +			
>>> +		      gfc_resolve_expr (lbound_e);
>>> +		      lbound = get_array_inq_function (GFC_ISYM_LBOUND,
>>> +						       lbound_e, i + 1);
>> free lbound_e?
> 
> It will be part of the lbound expression, or be simplified away.

get_array_inq_function makes a copy, so a _copy_ of lbound_e is in lbound.


>>> @@ -2639,6 +2665,8 @@ scalarized_expr (gfc_expr *e_in, gfc_expr **index,
>>>  	  i_index ++;
>>>  	}
>>>      }
>>> +  gfc_free_expr (e_in);
>>> +
>> This side effect is asking for trouble.
>> Instead of this, remove the copies made in the callers.
>> This is independant from the rest, so it can be made later as a follow-up.
> 
> Done (all in once).
> 
e_in is a copy of ei and is used unmodified as input for the copy to
lbound_e, so it can be removed completely.

OK with that change.  Thanks.

Mikael
diff mbox

Patch

Index: frontend-passes.c
===================================================================
--- frontend-passes.c	(Revision 222864)
+++ frontend-passes.c	(Arbeitskopie)
@@ -2532,16 +2532,17 @@  get_size_m1 (gfc_expr *e, int dimen)
  references have been frozen.  */
 
 static gfc_expr*
-scalarized_expr (gfc_expr *e_in, gfc_expr **index, int count_index)
+scalarized_expr (gfc_expr *ei, gfc_expr **index, int count_index)
 {
   gfc_array_ref *ar;
   int i;
   int rank;
-  gfc_expr *e;
+  gfc_expr *e, *e_in;
   int i_index;
   bool was_fullref;
 
-  e = gfc_copy_expr(e_in);
+  e = gfc_copy_expr(ei);
+  e_in = gfc_copy_expr (ei);
 
   rank = e->rank;
 
@@ -2607,18 +2608,54 @@  static gfc_expr*
 		}
 	      else
 		{
+		  gfc_expr *lbound_e;
+		  gfc_ref *ref;
+
+		  lbound_e = gfc_copy_expr (e_in);
+
+		  for (ref = lbound_e->ref; ref; ref = ref->next)
+		    if (ref->type == REF_ARRAY
+			&& (ref->u.ar.type == AR_FULL
+			    || ref->u.ar.type == AR_SECTION))
+		      break;
+
+		  if (ref->next)
+		    {
+		      gfc_free_ref_list (ref->next);
+		      ref->next = NULL;
+		    }
+
 		  if (!was_fullref)
 		    {
 		      /* Look at full individual sections, like a(:).  The first index
 			 is the lbound of a full ref.  */
-
+		      int j;
 		      gfc_array_ref *ar;
 
-		      ar = gfc_find_array_ref (e_in);
+		      ar = &ref->u.ar;
 		      ar->type = AR_FULL;
+		      for (j = 0; j < ar->dimen; j++)
+			{
+			  gfc_free_expr (ar->start[j]);
+			  ar->start[j] = NULL;
+			  gfc_free_expr (ar->end[j]);
+			  ar->end[j] = NULL;
+			  gfc_free_expr (ar->stride[j]);
+			  ar->stride[j] = NULL;
+			}
+
+		      /* We have to get rid of the shape, if there is one.  Do
+			 so by freeing it and calling gfc_resolve to rebuild
+			 it, if necessary.  */
+
+		      if (lbound_e->shape)
+			gfc_free_shape (&(lbound_e->shape), lbound_e->rank);
+
+		      lbound_e->rank = ar->dimen;
+		      gfc_resolve_expr (lbound_e);
 		    }
-		  lbound = get_array_inq_function (GFC_ISYM_LBOUND, e_in,
-						   i_index + 1);
+		  lbound = get_array_inq_function (GFC_ISYM_LBOUND, lbound_e,
+						   i + 1);
 		}
 	      
 	      ar->dimen_type[i] = DIMEN_ELEMENT;
@@ -2639,6 +2676,8 @@  static gfc_expr*
 	  i_index ++;
 	}
     }
+  gfc_free_expr (e_in);
+
   return e;
 }
 
@@ -2929,15 +2968,15 @@  inline_matmul_assign (gfc_code **c, int *walk_subt
 
       list[0] = var_3;
       list[1] = var_1;
-      cscalar = scalarized_expr (gfc_copy_expr (co->expr1), list, 2);
+      cscalar = scalarized_expr (co->expr1, list, 2);
 
       list[0] = var_3;
       list[1] = var_2;
-      ascalar = scalarized_expr (gfc_copy_expr (matrix_a), list, 2);
+      ascalar = scalarized_expr (matrix_a, list, 2);
 
       list[0] = var_2;
       list[1] = var_1;
-      bscalar = scalarized_expr (gfc_copy_expr (matrix_b), list, 2);
+      bscalar = scalarized_expr (matrix_b, list, 2);
 
       break;
 
@@ -2955,14 +2994,14 @@  inline_matmul_assign (gfc_code **c, int *walk_subt
       var_2 = do_2->ext.iterator->var;
 
       list[0] = var_2;
-      cscalar = scalarized_expr (gfc_copy_expr (co->expr1), list, 1);
+      cscalar = scalarized_expr (co->expr1, list, 1);
 
       list[0] = var_2;
       list[1] = var_1;
-      ascalar = scalarized_expr (gfc_copy_expr (matrix_a), list, 2);
+      ascalar = scalarized_expr (matrix_a, list, 2);
 
       list[0] = var_1;
-      bscalar = scalarized_expr (gfc_copy_expr (matrix_b), list, 1);
+      bscalar = scalarized_expr (matrix_b, list, 1);
 
       break;
 
@@ -2980,14 +3019,14 @@  inline_matmul_assign (gfc_code **c, int *walk_subt
       var_2 = do_2->ext.iterator->var;
 
       list[0] = var_1;
-      cscalar = scalarized_expr (gfc_copy_expr (co->expr1), list, 1);
+      cscalar = scalarized_expr (co->expr1, list, 1);
 
       list[0] = var_2;
-      ascalar = scalarized_expr (gfc_copy_expr (matrix_a), list, 1);
+      ascalar = scalarized_expr (matrix_a, list, 1);
 
       list[0] = var_2;
       list[1] = var_1;
-      bscalar = scalarized_expr (gfc_copy_expr (matrix_b), list, 2);
+      bscalar = scalarized_expr (matrix_b, list, 2);
 
       break;