[fortran] Fix PR 78238, ICE with SELECT TYPE with -fdefault-integer-8

Message ID f5403b79-3b29-1915-8a50-1b7cde4b73ce@netcologne.de
State New
Headers show
Series
  • [fortran] Fix PR 78238, ICE with SELECT TYPE with -fdefault-integer-8
Related show

Commit Message

Thomas Koenig Feb. 24, 2018, 8:04 p.m.
Hello world,

the attached patch fixes a 7/8 regression with SELECT TYPE where
the constant had the wrong type with -fdefault-integer-8.

Regression-tested. OK for trunk and gcc-7?

Regards

	Thomas

2018-01-24  Thomas Koenig  <tkoenig@gcc.gnu.org>

         PR fortran/78238
         * gfortran.h (gfc_integer_4_kind): Define.
         * resolve.c (resolve_select_type): Make sure that the
         kind of c->high is gfc_integer_4_kind.

2018-01-24  Thomas Koenig  <tkoenig@gcc.gnu.org>

         PR fortran/78238
         * gfortran.dg/select_type_40.f90: New test.

Comments

Jerry Feb. 24, 2018, 9:52 p.m. | #1
On 02/24/2018 12:04 PM, Thomas Koenig wrote:
> Hello world,

> 

> the attached patch fixes a 7/8 regression with SELECT TYPE where

> the constant had the wrong type with -fdefault-integer-8.

> 

> Regression-tested. OK for trunk and gcc-7?

> 

> Regards

> 

>      Thomas

> 

> 2018-01-24  Thomas Koenig  <tkoenig@gcc.gnu.org>

> 

>          PR fortran/78238

>          * gfortran.h (gfc_integer_4_kind): Define.

>          * resolve.c (resolve_select_type): Make sure that the

>          kind of c->high is gfc_integer_4_kind.

> 

> 2018-01-24  Thomas Koenig  <tkoenig@gcc.gnu.org>

> 

>          PR fortran/78238

>          * gfortran.dg/select_type_40.f90: New test.


OK Thomas,

Regards,

Jerry

Patch

Index: gfortran.h
===================================================================
--- gfortran.h	(Revision 257788)
+++ gfortran.h	(Arbeitskopie)
@@ -2921,6 +2921,7 @@  extern int gfc_numeric_storage_size;
 extern int gfc_character_storage_size;
 
 #define gfc_logical_4_kind 4
+#define gfc_integer_4_kind 4
 
 /* symbol.c */
 void gfc_clear_new_implicit (void);
Index: resolve.c
===================================================================
--- resolve.c	(Revision 257788)
+++ resolve.c	(Arbeitskopie)
@@ -8965,7 +8965,7 @@  resolve_select_type (gfc_code *code, gfc_namespace
 	    {
 	      vtab = gfc_find_derived_vtab (c->ts.u.derived);
 	      gcc_assert (vtab);
-	      c->high = gfc_get_int_expr (gfc_default_integer_kind, NULL,
+	      c->high = gfc_get_int_expr (gfc_integer_4_kind, NULL,
 					  c->ts.u.derived->hash_value);
 	    }
 	  else
@@ -8974,6 +8974,13 @@  resolve_select_type (gfc_code *code, gfc_namespace
 	      gcc_assert (vtab && CLASS_DATA (vtab)->initializer);
 	      e = CLASS_DATA (vtab)->initializer;
 	      c->high = gfc_copy_expr (e);
+	      if (c->high->ts.kind != gfc_integer_4_kind)
+		{
+		  gfc_typespec ts;
+		  ts.kind = gfc_integer_4_kind;
+		  ts.type = BT_INTEGER;
+		  gfc_convert_type_warn (c->high, &ts, 2, 0);
+		}
 	    }
 
 	  e = gfc_lval_expr_from_sym (vtab);