From: burnus Date: Wed, 27 Apr 2011 20:32:21 +0000 (+0000) Subject: 2011-04-27 Tobias Burnus X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=250bf96e91ab8af5530c683aed5c0ca6406d982c;p=thirdparty%2Fgcc.git 2011-04-27 Tobias Burnus PR fortran/48788 * resolve.c (resolve_global_procedure): Error recovery - avoid segfault for (non)character-returning functions. 2011-04-27 Tobias Burnus PR fortran/48788 * gfortran.dg/whole_file_34.f90: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@173048 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 78d687dbeedb..46df31889d79 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2011-04-27 Tobias Burnus + + PR fortran/48788 + * resolve.c (resolve_global_procedure): Error recovery - + avoid segfault for (non)character-returning functions. + 2011-04-26 Thomas Koenig * decl.c (gfc_match_end): Check that the block name starts diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index d7b95f51e177..144d30866508 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -2187,7 +2187,7 @@ resolve_global_procedure (gfc_symbol *sym, locus *where, /* F2003, 12.3.1.1 (3c); F2008, 12.4.2.2 (3c) */ if (sym->ts.type == BT_CHARACTER && sym->attr.if_source != IFSRC_IFBODY - && def_sym->ts.u.cl->length != NULL) + && def_sym->ts.type == BT_CHARACTER && def_sym->ts.u.cl->length != NULL) { gfc_charlen *cl = sym->ts.u.cl; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a99f1c423ba9..d61af1b2568d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-04-27 Tobias Burnus + + PR fortran/48788 + * gfortran.dg/whole_file_34.f90: New. + 2011-04-27 Jan Hubicka * gcc.dg/tree-ssa/inline-9.c: New testcase. diff --git a/gcc/testsuite/gfortran.dg/whole_file_34.f90 b/gcc/testsuite/gfortran.dg/whole_file_34.f90 new file mode 100644 index 000000000000..9b421e004ae1 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/whole_file_34.f90 @@ -0,0 +1,12 @@ +! { dg-do compile } +! +! PR fortran/48788 +! +! Contributed by Zdenek Sojka +! +function foo () +end function foo + character(4), external :: foo ! { dg-error "Return type mismatch of function" } + character(4) :: x + x = foo () +END