Need to convert the RHS to the type of the LHS when assigning.

Regtested on x86_64-pc-linux-gnu, committed as obvious.

gcc/fortran/ChangeLog:

2018-01-10  Janne Blomqvist  <j...@gcc.gnu.org>

        PR fortran/84740
        * trans-array.c (gfc_trans_array_ctor_element): Convert RHS to the
        LHS type when assigning.
---
 gcc/fortran/trans-array.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 474a7d1..8a0afe9 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -1562,7 +1562,8 @@ gfc_trans_array_ctor_element (stmtblock_t * pblock, tree 
desc,
          if (first_len)
            {
              gfc_add_modify (&se->pre, first_len_val,
-                                  se->string_length);
+                             fold_convert (TREE_TYPE (first_len_val),
+                                                      se->string_length));
              first_len = false;
            }
          else
@@ -1571,7 +1572,9 @@ gfc_trans_array_ctor_element (stmtblock_t * pblock, tree 
desc,
                 length.  */
              tree cond = fold_build2_loc (input_location, NE_EXPR,
                                           logical_type_node, first_len_val,
-                                          se->string_length);
+                                          fold_convert (TREE_TYPE
+                                                        (first_len_val),
+                                                        se->string_length));
              gfc_trans_runtime_check
                (true, false, cond, &se->pre, &expr->where,
                 "Different CHARACTER lengths (%ld/%ld) in array constructor",
-- 
2.7.4

Reply via email to