From 10650fbb88871139f242597b1f081041868c43f6 Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Thu, 29 Nov 2007 18:41:37 +0100 Subject: [PATCH] re PR fortran/34248 (ICE on assumed length character function) 2007-11-29 Tobias Burnus PR fortran/34248 * trans-decl.c (generate_dependency_declarations): Check for NULL pointers before accessing the string length. 2007-11-29 Tobias Burnus PR fortran/34248 * gfortran.dg/result_in_spec_3.f90: New. From-SVN: r130517 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/trans-decl.c | 4 +++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gfortran.dg/result_in_spec_3.f90 | 15 +++++++++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/result_in_spec_3.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index a176c27cb3b..8f185f7c115 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2007-11-29 Tobias Burnus + + PR fortran/34248 + * trans-decl.c (generate_dependency_declarations): Check + for NULL pointers before accessing the string length. + 2007-11-29 Tobias Burnus PR fortran/34262 diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index 84e72266322..e48de1f8867 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -2924,7 +2924,9 @@ generate_dependency_declarations (gfc_symbol *sym) int i; if (sym->ts.type == BT_CHARACTER - && sym->ts.cl->length->expr_type != EXPR_CONSTANT) + && sym->ts.cl + && sym->ts.cl->length + && sym->ts.cl->length->expr_type != EXPR_CONSTANT) generate_expr_decls (sym, sym->ts.cl->length); if (sym->as && sym->as->rank) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e062abc651c..889d220f3ea 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-11-29 Tobias Burnus + + PR fortran/34248 + * gfortran.dg/result_in_spec_3.f90: New. + 2007-11-29 Tobias Burnus PR fortran/34262 diff --git a/gcc/testsuite/gfortran.dg/result_in_spec_3.f90 b/gcc/testsuite/gfortran.dg/result_in_spec_3.f90 new file mode 100644 index 00000000000..1cfb8647d95 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/result_in_spec_3.f90 @@ -0,0 +1,15 @@ +! { dg-do compile } +! +! PR fortran/34248 +! +! There was an ICE for assumed-length functions +! if RESULT(...) was used and no value assigned +! to the result variable. +! +character(*) FUNCTION test() RESULT(ctab) + ctab = "Hello" +END function test + +FUNCTION test2() RESULT(res) + character(*) :: res +END function test2