PR fortran 57893

2013-10-29  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran 57893
	* trans-types.c (gfc_typenode_for_spec): Add typenode for
	BT_HOLLERITH. Note that the length is incorrect but unusable.

	PR fortran 58858
	* target-memory.c (gfc_element_size): Add element sizes for
	BT_VOID and BT_ASSUMED, using gfc_typenode_for_spec.

2013-10-29  Paul Thomas  <pault@gcc.gnu.org>

	PR fortran 57893
	* gfortran.dg/unlimited_polymorphic_13.f90 : Use real variables
	to determine sizes of real kinds.

	PR fortran 58858
	* gfortran.dg/unlimited_polymorphic_14.f90 : New test.

From-SVN: r204177

gcc/fortran/ChangeLog

@@ -1,3 +1,13 @@
+2013-10-29  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran 57893
+	* trans-types.c (gfc_typenode_for_spec): Add typenode for
+	BT_HOLLERITH. Note that the length is incorrect but unusable.
+
+	PR fortran 58858
+	* target-memory.c (gfc_element_size): Add element sizes for
+	BT_VOID and BT_ASSUMED, using gfc_typenode_for_spec.
+
 2013-10-24  Tobias Burnus  <burnus@net-b.de>
 
 	PR fortran/44646

gcc/fortran/target-memory.c

@@ -109,6 +109,8 @@ gfc_element_size (gfc_expr *e)
       return e->representation.length;
     case BT_DERIVED:
     case BT_CLASS:
+    case BT_VOID:
+    case BT_ASSUMED:
       {
 	/* Determine type size without clobbering the typespec for ISO C
 	   binding types.  */

gcc/fortran/trans-types.c

@@ -1099,6 +1099,12 @@ gfc_typenode_for_spec (gfc_typespec * spec)
 	basetype = gfc_get_character_type (spec->kind, spec->u.cl);
       break;
 
+    case BT_HOLLERITH:
+      /* Since this cannot be used, return a length one character.  */
+      basetype = gfc_get_character_type_len (gfc_default_character_kind,
+					     gfc_index_one_node);
+      break;
+
     case BT_DERIVED:
     case BT_CLASS:
       basetype = gfc_get_derived_type (spec->u.derived);

gcc/testsuite/ChangeLog

@@ -1,3 +1,12 @@
+2013-10-29  Paul Thomas  <pault@gcc.gnu.org>
+
+	PR fortran 57893
+	* gfortran.dg/unlimited_polymorphic_13.f90 : Use real variables
+	to determine sizes of real kinds.
+
+	PR fortran 58858
+	* gfortran.dg/unlimited_polymorphic_14.f90 : New test.
+
 2013-10-29  Balaji V. Iyer  <balaji.v.iyer@intel.com>
 
 	* c-c++-common/cilk-plus/CK/compound_cilk_spawn.c: New test.

gcc/testsuite/gfortran.dg/unlimited_polymorphic_13.f90

@@ -13,6 +13,10 @@ module m
   integer, parameter :: c2 = real_kinds(2)
   integer, parameter :: c3 = real_kinds(size(real_kinds)-1)
   integer, parameter :: c4 = real_kinds(size(real_kinds))
+  real(c1) :: r1
+  real(c2) :: r2
+  real(c3) :: r3
+  real(c4) :: r4
 contains
  subroutine s(o, k)
     class(*) :: o
@@ -21,11 +25,13 @@ contains
 
     select case (k)
      case (4)
-      sz = 32*2
+      sz = storage_size(r1)*2
      case (8)
-      sz = 64*2
+      sz = storage_size(r2)*2
-     case (10,16)
+     case (10)
-      sz = 128*2
+      sz = storage_size(r3)*2
+     case (16)
+      sz = storage_size(r4)*2
      case default
        call abort()
     end select
@@ -36,8 +42,6 @@ contains
         if (storage_size(o) /= sz) call abort()
       type is (complex(c2))
         if (storage_size(o) /= sz) call abort()
-    end select
-    select type (o)
       type is (complex(c3))
         if (storage_size(o) /= sz) call abort()
       type is (complex(c4))

gcc/testsuite/gfortran.dg/unlimited_polymorphic_14.f90

@@ -0,0 +1,26 @@
+! { dg-do run }
+!
+! Uncovered in fixing PR fortran/58793
+!
+! Contributed by Tobias Burnus  <burnus@gcc.gnu.org>
+!
+! Barfed on the hollerith argument
+!
+program test
+  logical l
+  call up("abc", l)
+  if (l) call abort
+  call up(3habc, l) ! { dg-warning "Legacy Extension" }
+  if (.not. l) call abort
+contains
+  subroutine up(x, l)
+    class(*) :: x
+    logical l
+    select type(x)
+     type is (character(*))
+      l = .false.
+     class default
+      l = .true.
+    end select
+  end subroutine
+end program test