diff mbox series

[fortran] Fix PR 85896, type confusion with min and max

Message ID 6bc83032-983d-1272-0745-89e5a534d1bb@netcologne.de
State New
Headers show
Series [fortran] Fix PR 85896, type confusion with min and max | expand

Commit Message

Thomas Koenig Oct. 30, 2018, 6:56 p.m. UTC 
Hello world,

the attached patchlet fixes a rejects-valid bug by simply ignoring the
type for max and min during simplification.  This is correct
because setting the type of a generic intrinsic function has
no effect.

It is a rare pleasure to fix a bug by removing code only :-)

Regression-tested. OK for trunk?

Regards

	Thomas

2018-10-30  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/85896
	* simplify.c (simplify_min_max): Do not convert the type of the
	return expression.

2018-10-30  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/85896
	* gfortran.dg/min_max_type.f90: New test.

Comments

Janne Blomqvist Oct. 30, 2018, 7:21 p.m. UTC | #1 
On Tue, Oct 30, 2018 at 8:57 PM Thomas Koenig <tkoenig@netcologne.de> wrote:

> Hello world,
>
> the attached patchlet fixes a rejects-valid bug by simply ignoring the
> type for max and min during simplification.  This is correct
> because setting the type of a generic intrinsic function has
> no effect.
>
> It is a rare pleasure to fix a bug by removing code only :-)
>
> Regression-tested. OK for trunk?
>

Ok, thanks.
diff mbox series

Patch

Index: simplify.c
===================================================================
--- simplify.c	(Revision 265502)
+++ simplify.c	(Arbeitskopie)
@@ -4961,11 +4961,9 @@  static gfc_expr *
 simplify_min_max (gfc_expr *expr, int sign)
 {
   gfc_actual_arglist *arg, *last, *extremum;
-  gfc_intrinsic_sym * specific;
 
   last = NULL;
   extremum = NULL;
-  specific = expr->value.function.isym;
 
   arg = expr->value.function.actual;
 
@@ -4995,15 +4993,6 @@  simplify_min_max (gfc_expr *expr, int sign)
   if (expr->value.function.actual->next != NULL)
     return NULL;
 
-  /* Convert to the correct type and kind.  */
-  if (expr->ts.type != BT_UNKNOWN)
-    return gfc_convert_constant (expr->value.function.actual->expr,
-	expr->ts.type, expr->ts.kind);
-
-  if (specific->ts.type != BT_UNKNOWN)
-    return gfc_convert_constant (expr->value.function.actual->expr,
-	specific->ts.type, specific->ts.kind);
-
   return gfc_copy_expr (expr->value.function.actual->expr);
 }