[10,Regression] FAIL: gfortran.dg/pr93365.f90 PR94386

Message ID 6ca2a650-ec5f-c2f4-7c73-1163b636919a@codethink.co.uk
State New
Headers show
Series
  • [10,Regression] FAIL: gfortran.dg/pr93365.f90 PR94386
Related show

Commit Message

Mark Eggleston April 1, 2020, 9:31 a.m.
Please find attached a patch to fix test case failures of pr93365.f90, 
pr93600_1.f90 and pr93600_2.f90.

OK to commit?

gcc/fortran/ChangeLog:

     Mark Eggleston  <mark.eggleston@codethink.com>

     PR fortran/04386
     expr.c (simplify_parameter_variable):  Restore code deleted
     in PR94246.

-- 
https://www.codethink.co.uk/privacy.html

Comments

Jonathan Wakely via Gcc-patches April 1, 2020, 9:43 a.m. | #1
On Wed, Apr 1, 2020 at 2:31 AM Mark Eggleston
<mark.eggleston@codethink.co.uk> wrote:
>

> Please find attached a patch to fix test case failures of pr93365.f90,

> pr93600_1.f90 and pr93600_2.f90.

>

> OK to commit?

>

> gcc/fortran/ChangeLog:

>

>      Mark Eggleston  <mark.eggleston@codethink.com>

>

>      PR fortran/04386

                         ^^^^^^^ Wrong PR #.
>      expr.c (simplify_parameter_variable):  Restore code deleted

>      in PR94246.

>

> --

> https://www.codethink.co.uk/privacy.html

>



-- 
H.J.
Jonathan Wakely via Gcc-patches April 1, 2020, 9:46 a.m. | #2
On Wed, Apr 01, 2020 at 02:43:46AM -0700, H.J. Lu via Gcc-patches wrote:
> On Wed, Apr 1, 2020 at 2:31 AM Mark Eggleston

> <mark.eggleston@codethink.co.uk> wrote:

> >

> > Please find attached a patch to fix test case failures of pr93365.f90,

> > pr93600_1.f90 and pr93600_2.f90.

> >

> > OK to commit?

> >

> > gcc/fortran/ChangeLog:

> >

> >      Mark Eggleston  <mark.eggleston@codethink.com>

> >

> >      PR fortran/04386

>                          ^^^^^^^ Wrong PR #.

> >      expr.c (simplify_parameter_variable):  Restore code deleted


And just one space after :, not two.

> >      in PR94246.


	Jakub
Mark Eggleston April 1, 2020, 9:46 a.m. | #3
On 01/04/2020 10:43, H.J. Lu wrote:
> On Wed, Apr 1, 2020 at 2:31 AM Mark Eggleston

> <mark.eggleston@codethink.co.uk> wrote:

>> Please find attached a patch to fix test case failures of pr93365.f90,

>> pr93600_1.f90 and pr93600_2.f90.

>>

>> OK to commit?

>>

>> gcc/fortran/ChangeLog:

>>

>>       Mark Eggleston  <mark.eggleston@codethink.com>

>>

>>       PR fortran/04386

>                           ^^^^^^^ Wrong PR #.

Fixed, thanks.
>>       expr.c (simplify_parameter_variable):  Restore code deleted

>>       in PR94246.

>>

>> --

>> https://www.codethink.co.uk/privacy.html

>>

>

-- 
https://www.codethink.co.uk/privacy.html
Tobias Burnus April 1, 2020, 9:50 a.m. | #4
LGTM with the PR/spacing fixed as noted by HJ and Jakub.

Thanks for the patch!

Tobias

On 4/1/20 11:31 AM, Mark Eggleston wrote:
> Please find attached a patch to fix test case failures of pr93365.f90,

> pr93600_1.f90 and pr93600_2.f90.

>

> OK to commit?

>

> gcc/fortran/ChangeLog:

>

>     Mark Eggleston  <mark.eggleston@codethink.com>

>

>     PR fortran/04386

>     expr.c (simplify_parameter_variable):  Restore code deleted

>     in PR94246.

>

-----------------
Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany
Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander Walter
Mark Eggleston April 1, 2020, 9:50 a.m. | #5
On 01/04/2020 10:46, Jakub Jelinek wrote:
> On Wed, Apr 01, 2020 at 02:43:46AM -0700, H.J. Lu via Gcc-patches wrote:

>> On Wed, Apr 1, 2020 at 2:31 AM Mark Eggleston

>> <mark.eggleston@codethink.co.uk> wrote:

>>> Please find attached a patch to fix test case failures of pr93365.f90,

>>> pr93600_1.f90 and pr93600_2.f90.

>>>

>>> OK to commit?

>>>

>>> gcc/fortran/ChangeLog:

>>>

>>>       Mark Eggleston  <mark.eggleston@codethink.com>

>>>

>>>       PR fortran/04386

>>                           ^^^^^^^ Wrong PR #.

>>>       expr.c (simplify_parameter_variable):  Restore code deleted

> And just one space after :, not two.

OK.
>

>>>       in PR94246.

> 	Jakub

>

>

-- 
https://www.codethink.co.uk/privacy.html

Patch

From 0825e19558b2243a3300fc4d468665cd6adecbe3 Mon Sep 17 00:00:00 2001
From: Mark Eggleston <markeggleston@gcc.gnu.org>
Date: Tue, 31 Mar 2020 15:54:10 +0100
Subject: [PATCH] fortran :  [10 Regression] FAIL: gfortran.dg/pr93365.f90
 PR94386

Failures of pr93365.f90,  pr93600_1.f90 and pr93600_2.f90.
Changes made by PR94246 delete and changed code from expr.c
introduced by PR93600, the deleted code.  This broke the PR93600
test cases.  Restoring the deleted code and leaving the changed
code alone allows the cases for PR93600 and PR94246 to pass.

gcc/fortran/ChangeLog:

	PR fortran/04386
	expr.c (simplify_parameter_variable):  Restore code deleted
	in PR94246.
---
 gcc/fortran/expr.c | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index 1106341df91..a9fa03ad153 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -2057,6 +2057,18 @@  simplify_parameter_variable (gfc_expr *p, int type)
     }
   gfc_expression_rank (p);
 
+  /* Is this an inquiry?  */
+  bool inquiry = false;
+  gfc_ref* ref = p->ref;
+  while (ref)
+    {
+      if (ref->type == REF_INQUIRY)
+	break;
+      ref = ref->next;
+    }
+  if (ref && ref->type == REF_INQUIRY)
+    inquiry = ref->u.i == INQUIRY_LEN || ref->u.i == INQUIRY_KIND;
+
   if (gfc_is_size_zero_array (p))
     {
       if (p->expr_type == EXPR_ARRAY)
@@ -2069,15 +2081,22 @@  simplify_parameter_variable (gfc_expr *p, int type)
       e->value.constructor = NULL;
       e->shape = gfc_copy_shape (p->shape, p->rank);
       e->where = p->where;
-      gfc_replace_expr (p, e);
-      return true;
+      /* If %kind and %len are not used then we're done, otherwise
+	 drop through for simplification.  */
+      if (!inquiry)
+	{
+	  gfc_replace_expr (p, e);
+	  return true;
+	}
     }
+  else
+    {
+      e = gfc_copy_expr (p->symtree->n.sym->value);
+      if (e == NULL)
+	return false;
 
-  e = gfc_copy_expr (p->symtree->n.sym->value);
-  if (e == NULL)
-    return false;
-
-  e->rank = p->rank;
+      e->rank = p->rank;
+    }
 
   if (e->ts.type == BT_CHARACTER && e->ts.u.cl == NULL)
     e->ts.u.cl = gfc_new_charlen (gfc_current_ns, p->ts.u.cl);
-- 
2.11.0