diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2015-01-26 21:58:42 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2015-01-26 21:58:42 +0000 |
| commit | 40a778bd519125d4385bc155d9ae6e6e04d703c3 (patch) | |
| tree | ee654adf268670eddd69d015f6fba4df4f5f882f /gcc/fortran/resolve.c | |
| parent | 1b7706c830cdf535d14d68d4f2e581592fbcdb85 (diff) | |
| download | gcc-40a778bd519125d4385bc155d9ae6e6e04d703c3.zip gcc-40a778bd519125d4385bc155d9ae6e6e04d703c3.tar.gz gcc-40a778bd519125d4385bc155d9ae6e6e04d703c3.tar.bz2 | |
re PR fortran/62044 (ICE in USE statement with RENAME for extended derived type)
2015-01-26 Paul Thomas <pault@gcc.gnu.org>
PR fortran/62044
* resolve.c (resolve_allocate_expr): If the default initializer
is NULL, keep the original MOLD expression so that the correct
typespec is available.
2015-01-26 Paul Thomas <pault@gcc.gnu.org>
PR fortran/62044
* gfortran.dg/allocate_with_mold_1.f90: New test
From-SVN: r220140
Diffstat (limited to 'gcc/fortran/resolve.c')
| -rw-r--r-- | gcc/fortran/resolve.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index a9645a0..3fe09f6 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -6995,9 +6995,12 @@ resolve_allocate_expr (gfc_expr *e, gfc_code *code) { /* Default initialization via MOLD (non-polymorphic). */ gfc_expr *rhs = gfc_default_initializer (&code->expr3->ts); - gfc_resolve_expr (rhs); - gfc_free_expr (code->expr3); - code->expr3 = rhs; + if (rhs != NULL) + { + gfc_resolve_expr (rhs); + gfc_free_expr (code->expr3); + code->expr3 = rhs; + } } if (e->ts.type == BT_CLASS && !unlimited && !UNLIMITED_POLY (code->expr3)) |