diff mbox series

[fortran] Fix PR 43072

Message ID 119d7610-8bca-30e2-fcb0-86ed2e9eeb09@netcologne.de
State New
Headers show
Series [fortran] Fix PR 43072 | expand

Commit Message

Thomas Koenig Jan. 15, 2019, 9:58 p.m. UTC 
Hello world,

the attached patch fixes a missed optimization where a substring equal
in length to the original variable currently leads to an unneeded
temporary.

Regression-tested. OK for trunk?

Regards

	Thomas

2019-01-15  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/43072
	* resolve.c (resolve_array_ref): Add equal_length argument; set it
	if the length of the substring equals that of the orignal
	variable.
	(resolve_ref): Remove the substring if it is equal in length
	length to the original variable, unless it is an EXPR_SUBSTRING).

2019-01-15  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/43072
	* gfortran.dg/actual_array_substr_3.f90: New test.

Comments

Steve Kargl Jan. 15, 2019, 10:11 p.m. UTC | #1 
On Tue, Jan 15, 2019 at 10:58:33PM +0100, Thomas Koenig wrote:
> 
> the attached patch fixes a missed optimization where a substring equal
> in length to the original variable currently leads to an unneeded
> temporary.
> 
> Regression-tested. OK for trunk?

Yes.  See below.

> 
> 2019-01-15  Thomas Koenig  <tkoenig@gcc.gnu.org>
> 
> 	PR fortran/43072
> 	* resolve.c (resolve_array_ref): Add equal_length argument; set it
> 	if the length of the substring equals that of the orignal
> 	variable.
> 	(resolve_ref): Remove the substring if it is equal in length
> 	length to the original variable, unless it is an EXPR_SUBSTRING).

in length length?
Thomas Koenig Jan. 15, 2019, 10:37 p.m. UTC | #2 
Hi Steve,

> On Tue, Jan 15, 2019 at 10:58:33PM +0100, Thomas Koenig wrote:
>>
>> the attached patch fixes a missed optimization where a substring equal
>> in length to the original variable currently leads to an unneeded
>> temporary.
>>
>> Regression-tested. OK for trunk?
> 
> Yes.  See below.

Thanks.

>>
>> 2019-01-15  Thomas Koenig  <tkoenig@gcc.gnu.org>
>>
>> 	PR fortran/43072
>> 	* resolve.c (resolve_array_ref): Add equal_length argument; set it
>> 	if the length of the substring equals that of the orignal
>> 	variable.
>> 	(resolve_ref): Remove the substring if it is equal in length
>> 	length to the original variable, unless it is an EXPR_SUBSTRING).
> 
> in length length?

Fixed in the commit.

Regards

	Thomas
diff mbox series

Patch

Index: resolve.c
===================================================================
--- resolve.c	(Revision 267903)
+++ resolve.c	(Arbeitskopie)
@@ -4873,7 +4873,7 @@  resolve_array_ref (gfc_array_ref *ar)
 
 
 static bool
-resolve_substring (gfc_ref *ref)
+resolve_substring (gfc_ref *ref, bool *equal_length)
 {
   int k = gfc_validate_kind (BT_INTEGER, gfc_charlen_int_kind, false);
 
@@ -4944,6 +4944,13 @@  static bool
 		     &ref->u.ss.end->where);
 	  return false;
 	}
+      /*  If the substring has the same length as the original
+	  variable, the reference itself can be deleted.  */
+
+      if (ref->u.ss.length != NULL
+	  && compare_bound (ref->u.ss.end, ref->u.ss.length->length) == CMP_EQ
+	  && compare_bound_int (ref->u.ss.start, 1) == CMP_EQ)
+	*equal_length = true;
     }
 
   return true;
@@ -5037,7 +5044,8 @@  static bool
 resolve_ref (gfc_expr *expr)
 {
   int current_part_dimension, n_components, seen_part_dimension;
-  gfc_ref *ref;
+  gfc_ref *ref, **prev;
+  bool equal_length;
 
   for (ref = expr->ref; ref; ref = ref->next)
     if (ref->type == REF_ARRAY && ref->u.ar.as == NULL)
@@ -5046,7 +5054,8 @@  resolve_ref (gfc_expr *expr)
 	break;
       }
 
-  for (ref = expr->ref; ref; ref = ref->next)
+  
+  for (ref = expr->ref, prev = &expr->ref; ref; prev = &ref->next, ref = ref->next)
     switch (ref->type)
       {
       case REF_ARRAY:
@@ -5059,8 +5068,19 @@  resolve_ref (gfc_expr *expr)
 	break;
 
       case REF_SUBSTRING:
-	if (!resolve_substring (ref))
+	equal_length = false;
+	if (!resolve_substring (ref, &equal_length))
 	  return false;
+
+	if (expr->expr_type != EXPR_SUBSTRING && equal_length)
+	  {
+	    /* Remove the reference and move the charlen, if any.  */
+	    *prev = ref->next;
+	    ref->next = NULL;
+	    expr->ts.u.cl = ref->u.ss.length;
+	    ref->u.ss.length = NULL;
+	    gfc_free_ref_list (ref);
+	  }
 	break;
       }