aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/frontend-passes.c
diff options
context:
space:
mode:
authorThomas Koenig <tkoenig@gcc.gnu.org>2017-12-01 18:06:31 +0000
committerThomas Koenig <tkoenig@gcc.gnu.org>2017-12-01 18:06:31 +0000
commit1cde289f1cf4d06815dbef089e969f7be0294178 (patch)
tree722d167eee3f2c6cb5fc7f88c7c5cf030cdd467d /gcc/fortran/frontend-passes.c
parentad8fda29e6274dd28aa11d15e98cc777f56ffb37 (diff)
downloadgcc-1cde289f1cf4d06815dbef089e969f7be0294178.zip
gcc-1cde289f1cf4d06815dbef089e969f7be0294178.tar.gz
gcc-1cde289f1cf4d06815dbef089e969f7be0294178.tar.bz2
re PR fortran/83224 (creating character array from elements shorter than declared does not pad with whitespace properly and aborts)
2017-12-01 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/83224 * frontend-passes.c (create_var): Also handle character arrays, handling deferred lenghts. 2017-12-01 Thomas Koenig <tkoenig@gcc.gnu.org> PR fortran/83224 * gfortran.dg/dependency_51.f90: New test. From-SVN: r255331
Diffstat (limited to 'gcc/fortran/frontend-passes.c')
-rw-r--r--gcc/fortran/frontend-passes.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c
index 80d8767..3382058 100644
--- a/gcc/fortran/frontend-passes.c
+++ b/gcc/fortran/frontend-passes.c
@@ -767,7 +767,7 @@ create_var (gfc_expr * e, const char *vname)
}
deferred = 0;
- if (e->ts.type == BT_CHARACTER && e->rank == 0)
+ if (e->ts.type == BT_CHARACTER)
{
gfc_expr *length;
@@ -778,6 +778,8 @@ create_var (gfc_expr * e, const char *vname)
else
{
symbol->attr.allocatable = 1;
+ symbol->ts.u.cl->length = NULL;
+ symbol->ts.deferred = 1;
deferred = 1;
}
}
@@ -790,7 +792,7 @@ create_var (gfc_expr * e, const char *vname)
result = gfc_get_expr ();
result->expr_type = EXPR_VARIABLE;
- result->ts = e->ts;
+ result->ts = symbol->ts;
result->ts.deferred = deferred;
result->rank = e->rank;
result->shape = gfc_copy_shape (e->shape, e->rank);