re PR fortran/78238 ([OOP] ICE: verify_gimple failed, with -fdefault-integer-8)

2018-02-25  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-02-25  Thomas Koenig  <tkoenig@gcc.gnu.org>

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

From-SVN: r257968

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 6e69042c89677c67981f0e3b7cc1e6254d84857b..78e3c2e164de1b8b5877f31774d424a3dd4d5e96 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2018-02-25  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-02-24  Steven G. Kargl <kargl@gcc.gnu.org>
 
        PR fortran/30792

diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h
index f35430dcd20771d89c54f2d8b9b32a0d2c81baf4..94f7399885ac09758bd13f0ac150c4383f3c456d 100644 (file)
--- a/gcc/fortran/gfortran.h
+++ b/gcc/fortran/gfortran.h
@@ -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);

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index fee5b1becf54cf1da2673eff903a05ca8662275e..6869bce2edb735a078b95a93b9730e7961e7fcc7 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -8961,7 +8961,7 @@ resolve_select_type (gfc_code *code, gfc_namespace *old_ns)
            {
              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
@@ -8970,6 +8970,13 @@ resolve_select_type (gfc_code *code, gfc_namespace *old_ns)
              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);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 60d8a9e0843ff5802157c927874d152358063537..0f8219d0717d254aaf5799050ea1cccda85853c8 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-25  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR fortran/78238
+       * gfortran.dg/select_type_40.f90: New test.
+
 2018-02-24  Steven G. Kargl <kargl@gcc.gnu.org>
 
        PR fortran/30792

diff --git a/gcc/testsuite/gfortran.dg/select_type_40.f90 b/gcc/testsuite/gfortran.dg/select_type_40.f90
new file mode 100644 (file)
index 0000000..4bfa1c7
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/select_type_40.f90
@@ -0,0 +1,9 @@
+! { dg-do compile }
+! { dg-additional-options "-fdefault-integer-8" }
+! PR 78238 - this used to cause an ICE.
+! Original test cae by Gerhard Steinmetz
+class(*), allocatable :: q
+select type (x => q)
+type is (real)
+end select
+end