re PR fortran/51073 (_gfortran_caf_register incorrectly assumes malloc(0) returns...

2011-11-14  Tobias Burnus  <burnus@net-b.de>

        PR fortran/51073
        * trans-decl.c (generate_coarray_sym_init): Handle zero-sized
        * arrays.

From-SVN: r181348

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index dca83988744b87b488fcd3730cd48ee64d09e37c..01abd74f890e721981194e3a5211ad9e15aae665 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-14  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/51073
+       * trans-decl.c (generate_coarray_sym_init): Handle zero-sized arrays.
+
 2011-11-09  Tobias Burnus  <burnus@net-b.de>
 
        * symbol.c (clear_sym_mark, traverse_ns): Remove functions.

diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index b90b0ab25b685e1d1897d295d8f968d6f312d305..80e4f555d1c90c7fc773316aad5f4b7b546be3fb 100644 (file)
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -4234,12 +4234,16 @@ generate_coarray_sym_init (gfc_symbol *sym)
 
   size = TYPE_SIZE_UNIT (gfc_get_element_type (TREE_TYPE (decl)));
 
+  /* Ensure that we do not have size=0 for zero-sized arrays.  */ 
+  size = fold_build2_loc (input_location, MAX_EXPR, size_type_node,
+                         fold_convert (size_type_node, size),
+                         build_int_cst (size_type_node, 1));
+
   if (GFC_TYPE_ARRAY_RANK (TREE_TYPE (decl)))
     {
       tmp = GFC_TYPE_ARRAY_SIZE (TREE_TYPE (decl));
       size = fold_build2_loc (input_location, MULT_EXPR, size_type_node,
-                             fold_convert (size_type_node, tmp),
-                             fold_convert (size_type_node, size));
+                             fold_convert (size_type_node, tmp), size);
     }
 
   gcc_assert (GFC_TYPE_ARRAY_CAF_TOKEN (TREE_TYPE (decl)) != NULL_TREE);