Patchwork [Fortran,committed] PR 45077 - derived type decl fix

login
register
mail settings
Submitter Tobias Burnus
Date July 28, 2010, 8:45 a.m.
Message ID <4C4FEE15.3050108@net-b.de>
Download mbox | patch
Permalink /patch/60126/
State New
Headers show

Comments

Tobias Burnus - July 28, 2010, 8:45 a.m.
Dear all,

another case where the decl of a derived type was wrong: If the derived
type was defined in a module, but not used in the module. In this case,
the backend_decl of the module type is NULL. Thus, at every place where
the type was used, a new backend_decl was created.

The fix is obvious: Just create the backend decl.

Note, however, that when the module is moved into a separate file, the
test case will still fail as no suitable "gsym" exists. That's similar
to the remaining issue of PR 44945 - except that there the issue is a
module variable. Possibly, the same issue also exists for module
procedures - though, I couldn't produce a failing test case.

Build and regtested on x86-64-linux.
Committed as Rev. 162619.

Tobias

Patch

2010-07-28  Tobias Burnus  <burnus@net-b.de>

	PR fortran/45077
	* trans-types.c (gfc_get_derived_type): Fix DT declaration
	from modules for whole-file mode.

2010-07-28  Tobias Burnus  <burnus@net-b.de>

	PR fortran/45077
	* gfortran.dg/whole_file_24.f90: New.

Index: gcc/fortran/trans-types.c
===================================================================
--- gcc/fortran/trans-types.c	(revision 162617)
+++ gcc/fortran/trans-types.c	(working copy)
@@ -1994,8 +1994,10 @@  gfc_get_derived_type (gfc_symbol * deriv
 	  gfc_symbol *s;
 	  s = NULL;
 	  gfc_find_symbol (derived->name, gsym->ns, 0, &s);
-	  if (s && s->backend_decl)
+	  if (s)
 	    {
+	      if (!s->backend_decl)
+		s->backend_decl = gfc_get_derived_type (s);
 	      gfc_copy_dt_decls_ifequal (s, derived, true);
 	      goto copy_derived_types;
 	    }
Index: gcc/testsuite/gfortran.dg/whole_file_24.f90
===================================================================
--- gcc/testsuite/gfortran.dg/whole_file_24.f90	(revision 0)
+++ gcc/testsuite/gfortran.dg/whole_file_24.f90	(revision 0)
@@ -0,0 +1,35 @@ 
+! { dg-do compile }
+!
+! PR fortran/45077
+!
+! Contributed by Dominique d'Humieres, based on a test
+! case of Juergen Reuter.
+!
+
+module iso_red
+  type, public :: varying_string
+     character(LEN=1), dimension(:), allocatable :: chars
+  end type varying_string
+end module iso_red
+
+module ifiles
+  use iso_red, string_t => varying_string
+contains
+  function line_get_string_advance (line) result (string)
+    type(string_t) :: string
+    character :: line
+  end function line_get_string_advance
+end module ifiles
+
+module syntax_rules
+  use iso_red, string_t => varying_string
+  use ifiles, only: line_get_string_advance
+contains
+  subroutine syntax_init_from_ifile ()
+    type(string_t) :: string
+       string = line_get_string_advance ("")
+  end subroutine syntax_init_from_ifile
+end module syntax_rules
+end
+
+! { dg-final { cleanup-modules "iso_red ifiles syntax_rules" } }