trans-decl.c (gfc_get_symbol_decl): Removed duplicate code.

	* trans-decl.c (gfc_get_symbol_decl): Removed duplicate code.
	* trans-expr.c (gfc_conv_intrinsic_to_class): Fixed indentation.
	Fixed datatype of charlen to be a 32-bit int.

From-SVN: r220345

gcc/fortran/ChangeLog

+
+2015-01-30  Andre Vehreschild  <vehre@gmx.de>
+
+	* trans-decl.c (gfc_get_symbol_decl): Removed duplicate code.
+	* trans-expr.c (gfc_conv_intrinsic_to_class): Fixed indentation.
+	Fixed datatype of charlen to be a 32-bit int.
+
 2015-02-01  Joseph Myers  <joseph@codesourcery.com>
 
 	* error.c (gfc_warning (const char *, ...), gfc_warning_now (const

gcc/fortran/trans-decl.c

@@ -1443,8 +1443,6 @@ gfc_get_symbol_decl (gfc_symbol * sym)
       if (sym->ts.type == BT_CLASS && sym->backend_decl)
 	GFC_DECL_CLASS(sym->backend_decl) = 1;
 
-      if (sym->ts.type == BT_CLASS && sym->backend_decl)
-	GFC_DECL_CLASS(sym->backend_decl) = 1;
      return sym->backend_decl;
     }
 

gcc/fortran/trans-expr.c

@@ -666,7 +666,7 @@ gfc_conv_intrinsic_to_class (gfc_se *parmse, gfc_expr *e,
 	    {
 	      /* Amazingly all data is present to compute the length of a
 		 constant string, but the expression is not yet there.  */
-              e->ts.u.cl->length = gfc_get_constant_expr (BT_INTEGER, 1,
+	      e->ts.u.cl->length = gfc_get_constant_expr (BT_INTEGER, 4,
 							  &e->where);
 	      mpz_set_ui (e->ts.u.cl->length->value.integer,
 			  e->value.character.length);