diff options
| author | Martin Liska <mliska@suse.cz> | 2022-11-08 12:36:43 +0100 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-11-08 12:36:43 +0100 |
| commit | 4b13c73bba935443be3207abf26f7ba05f79badc (patch) | |
| tree | a6bb1525d07859fa8fc6f61dd13df7ddfd1ac254 /gcc/fortran/trans-expr.cc | |
| parent | 33f5dde0cd15df9cf89b29280d4ff5fcf7b30e66 (diff) | |
| parent | fa271afb58423014e2feef9f15c1a87428e64ddc (diff) | |
| download | gcc-devel/sphinx.tar.gz | |
Merge branch 'master' into devel/sphinxdevel/sphinx
Diffstat (limited to 'gcc/fortran/trans-expr.cc')
| -rw-r--r-- | gcc/fortran/trans-expr.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/fortran/trans-expr.cc b/gcc/fortran/trans-expr.cc index e7b9211f17e..f3fbb527157 100644 --- a/gcc/fortran/trans-expr.cc +++ b/gcc/fortran/trans-expr.cc @@ -11236,10 +11236,10 @@ alloc_scalar_allocatable_for_assignment (stmtblock_t *block, if (expr1->ts.type == BT_CHARACTER && expr1->ts.deferred) { - /* Use the rhs string length and the lhs element size. */ + /* Use the rhs string length and the lhs element size. Note that 'size' is + used below for the string-length comparison, only. */ size = string_length; - tmp = TREE_TYPE (gfc_typenode_for_spec (&expr1->ts)); - tmp = TYPE_SIZE_UNIT (tmp); + tmp = TYPE_SIZE_UNIT (gfc_get_char_type (expr1->ts.kind)); size_in_bytes = fold_build2_loc (input_location, MULT_EXPR, TREE_TYPE (tmp), tmp, fold_convert (TREE_TYPE (tmp), size)); |