git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 Upstream-Status: Inappropriate [Backport]
   2 From cb79606d4958a3f3df1adfcc00b641e3b8089819 Mon Sep 17 00:00:00 2001
   3 From: burnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4>
   4 Date: Thu, 28 Apr 2011 18:43:16 +0000
   5 Subject: [PATCH 193/200] 2011-04-28  Tobias Burnus  <burnus@net-b.de>
   6
   7         PR fortran/48788
   8         * resolve.c (resolve_global_procedure): Error recovery -
   9         avoid segfault for (non)character-returning functions.
  10
  11
  12 2011-04-28  Tobias Burnus  <burnus@net-b.de>
  13
  14         PR fortran/48788
  15         * gfortran.dg/whole_file_34.f90: New.
  16
  17
  18
  19 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch@173126 138bc75d-0d04-0410-961f-82ee72b054a4
  20
  21 index 1fef22b..75e4697 100644
  22 --- a/gcc/fortran/resolve.c
  23 +++ b/gcc/fortran/resolve.c
  24 @@ -2187,7 +2187,7 @@ resolve_global_procedure (gfc_symbol *sym, locus *where,
  25
  26           /* F2003, 12.3.1.1 (3c); F2008, 12.4.2.2 (3c)  */
  27           if (sym->ts.type == BT_CHARACTER && sym->attr.if_source != IFSRC_IFBODY
  28 -             && def_sym->ts.u.cl->length != NULL)
  29 +             && def_sym->ts.type == BT_CHARACTER && def_sym->ts.u.cl->length != NULL)
  30             {
  31               gfc_charlen *cl = sym->ts.u.cl;
  32
  33 new file mode 100644
  34 index 0000000..9b421e0
  35 --- /dev/null
  36 +++ b/gcc/testsuite/gfortran.dg/whole_file_34.f90
  37 @@ -0,0 +1,12 @@
  38 +! { dg-do compile }
  39 +!
  40 +! PR fortran/48788
  41 +!
  42 +! Contributed by Zdenek Sojka
  43 +!
  44 +function foo ()
  45 +end function foo
  46 +  character(4), external :: foo ! { dg-error "Return type mismatch of function" }
  47 +  character(4) :: x
  48 +  x = foo ()
  49 +END
  50 --
  51 1.7.0.4
  52