re PR fortran/40822 (Internal compiler error when Fortran intrinsic LEN referenced...

2009-07-24  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/40822
	* array.c (gfc_resolve_character_array_constructor): Use new function
	gfc_new_charlen.
	* decl.c (add_init_expr_to_sym,variable_decl,match_char_spec,
	gfc_match_implicit): Ditto.
	* expr.c (gfc_simplify_expr): Ditto.
	* gfortran.h (gfc_new_charlen): New prototype.
	* iresolve.c (check_charlen_present,gfc_resolve_char_achar): Use new
	function gfc_new_charlen.
	* module.c (mio_charlen): Ditto.
	* resolve.c (gfc_resolve_substring_charlen,
	gfc_resolve_character_operator,fixup_charlen,resolve_fl_derived,
	resolve_symbol): Ditto.
	* symbol.c (gfc_new_charlen): New function to create a new gfc_charlen
	structure and add it to a namespace.
	(gfc_copy_formal_args_intr): Make sure ts.cl is present
	for CHARACTER variables.

2009-07-24  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/40822
	* gfortran.dg/char_length_16.f90: New.

From-SVN: r150047

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 580a0b2c259c865a16b643cf320192f2b7c66343..5f6cf27a68d594597b0a2089442058eaa4ff7a0e 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,23 @@
+2009-07-24  Janus Weil  <janus@gcc.gnu.org>
+
+       PR fortran/40822
+       * array.c (gfc_resolve_character_array_constructor): Use new function
+       gfc_new_charlen.
+       * decl.c (add_init_expr_to_sym,variable_decl,match_char_spec,
+       gfc_match_implicit): Ditto.
+       * expr.c (gfc_simplify_expr): Ditto.
+       * gfortran.h (gfc_new_charlen): New prototype.
+       * iresolve.c (check_charlen_present,gfc_resolve_char_achar): Use new
+       function gfc_new_charlen.
+       * module.c (mio_charlen): Ditto.
+       * resolve.c (gfc_resolve_substring_charlen,
+       gfc_resolve_character_operator,fixup_charlen,resolve_fl_derived,
+       resolve_symbol): Ditto.
+       * symbol.c (gfc_new_charlen): New function to create a new gfc_charlen
+       structure and add it to a namespace.
+       (gfc_copy_formal_args_intr): Make sure ts.cl is present
+       for CHARACTER variables.
+
 2009-07-24  Jakub Jelinek  <jakub@redhat.com>
 
        PR fortran/40643

diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index 4d3345f3fd4347206b796db2a6f6fc3ca0e87a28..2fee4658a0d5589408fcc72b15ae729d8144ddd6 100644 (file)
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -1599,9 +1599,7 @@ gfc_resolve_character_array_constructor (gfc_expr *expr)
            goto got_charlen;
          }
 
-      expr->ts.cl = gfc_get_charlen ();
-      expr->ts.cl->next = gfc_current_ns->cl_list;
-      gfc_current_ns->cl_list = expr->ts.cl;
+      expr->ts.cl = gfc_new_charlen (gfc_current_ns);
     }
 
 got_charlen:

diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index e2816348643bbce14ea4cc5bbe5797aaf2623e05..0207683349b9cef6c50ad42a86a9095a10f0b379 100644 (file)
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -1258,9 +1258,7 @@ add_init_expr_to_sym (const char *name, gfc_expr **initp, locus *var_locus)
              int clen;
              /* If there are multiple CHARACTER variables declared on the
                 same line, we don't want them to share the same length.  */
-             sym->ts.cl = gfc_get_charlen ();
-             sym->ts.cl->next = gfc_current_ns->cl_list;
-             gfc_current_ns->cl_list = sym->ts.cl;
+             sym->ts.cl = gfc_new_charlen (gfc_current_ns);
 
              if (sym->attr.flavor == FL_PARAMETER)
                {
@@ -1292,9 +1290,7 @@ add_init_expr_to_sym (const char *name, gfc_expr **initp, locus *var_locus)
                {
                  /* Build a new charlen to prevent simplification from
                     deleting the length before it is resolved.  */
-                 init->ts.cl = gfc_get_charlen ();
-                 init->ts.cl->next = gfc_current_ns->cl_list;
-                 gfc_current_ns->cl_list = sym->ts.cl;
+                 init->ts.cl = gfc_new_charlen (gfc_current_ns);
                  init->ts.cl->length = gfc_copy_expr (sym->ts.cl->length);
 
                  for (p = init->value.constructor; p; p = p->next)
@@ -1597,9 +1593,7 @@ variable_decl (int elem)
       switch (match_char_length (&char_len))
        {
        case MATCH_YES:
-         cl = gfc_get_charlen ();
-         cl->next = gfc_current_ns->cl_list;
-         gfc_current_ns->cl_list = cl;
+         cl = gfc_new_charlen (gfc_current_ns);
 
          cl->length = char_len;
          break;
@@ -1611,9 +1605,7 @@ variable_decl (int elem)
              && (current_ts.cl->length == NULL
                  || current_ts.cl->length->expr_type != EXPR_CONSTANT))
            {
-             cl = gfc_get_charlen ();
-             cl->next = gfc_current_ns->cl_list;
-             gfc_current_ns->cl_list = cl;
+             cl = gfc_new_charlen (gfc_current_ns);
              cl->length = gfc_copy_expr (current_ts.cl->length);
            }
          else
@@ -2235,9 +2227,7 @@ done:
     }
 
   /* Do some final massaging of the length values.  */
-  cl = gfc_get_charlen ();
-  cl->next = gfc_current_ns->cl_list;
-  gfc_current_ns->cl_list = cl;
+  cl = gfc_new_charlen (gfc_current_ns);
 
   if (seen_length == 0)
     cl->length = gfc_int_expr (1);
@@ -2611,9 +2601,7 @@ gfc_match_implicit (void)
              if (ts.type == BT_CHARACTER && !ts.cl)
                {
                  ts.kind = gfc_default_character_kind;
-                 ts.cl = gfc_get_charlen ();
-                 ts.cl->next = gfc_current_ns->cl_list;
-                 gfc_current_ns->cl_list = ts.cl;
+                 ts.cl = gfc_new_charlen (gfc_current_ns);
                  ts.cl->length = gfc_int_expr (1);
                }
 

diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index a8f9f6a213e82d2833ebf9a0098bcf24084a68b3..df399b90e7d780beef7ee658e3c62bfe02fb9483 100644 (file)
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -1681,9 +1681,7 @@ gfc_simplify_expr (gfc_expr *p, int type)
          gfc_free (p->value.character.string);
          p->value.character.string = s;
          p->value.character.length = end - start;
-         p->ts.cl = gfc_get_charlen ();
-         p->ts.cl->next = gfc_current_ns->cl_list;
-         gfc_current_ns->cl_list = p->ts.cl;
+         p->ts.cl = gfc_new_charlen (gfc_current_ns);
          p->ts.cl->length = gfc_int_expr (p->value.character.length);
          gfc_free_ref_list (p->ref);
          p->ref = NULL;

diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h
index 83c36c5ad85f778d99dd2196efa0b31ab6b575ef..ce8e6fc1461986bbb830353521b02038f3218ef4 100644 (file)
--- a/gcc/fortran/gfortran.h
+++ b/gcc/fortran/gfortran.h
@@ -2415,6 +2415,7 @@ int gfc_symbols_could_alias (gfc_symbol *, gfc_symbol *);
 void gfc_undo_symbols (void);
 void gfc_commit_symbols (void);
 void gfc_commit_symbol (gfc_symbol *);
+gfc_charlen *gfc_new_charlen (gfc_namespace *);
 void gfc_free_charlen (gfc_charlen *, gfc_charlen *);
 void gfc_free_namespace (gfc_namespace *);
 

diff --git a/gcc/fortran/iresolve.c b/gcc/fortran/iresolve.c
index 619d7e9546af0a004d32cf1546c0ab62afb4e603..fdbf40c4408349c04fb0fb892b1bc9af89056fea 100644 (file)
--- a/gcc/fortran/iresolve.c
+++ b/gcc/fortran/iresolve.c
@@ -63,11 +63,7 @@ static void
 check_charlen_present (gfc_expr *source)
 {
   if (source->ts.cl == NULL)
-    {
-      source->ts.cl = gfc_get_charlen ();
-      source->ts.cl->next = gfc_current_ns->cl_list;
-      gfc_current_ns->cl_list = source->ts.cl;
-    }
+    source->ts.cl = gfc_new_charlen (gfc_current_ns);
 
   if (source->expr_type == EXPR_CONSTANT)
     {
@@ -165,9 +161,7 @@ gfc_resolve_char_achar (gfc_expr *f, gfc_expr *x, gfc_expr *kind,
   f->ts.type = BT_CHARACTER;
   f->ts.kind = (kind == NULL)
             ? gfc_default_character_kind : mpz_get_si (kind->value.integer);
-  f->ts.cl = gfc_get_charlen ();
-  f->ts.cl->next = gfc_current_ns->cl_list;
-  gfc_current_ns->cl_list = f->ts.cl;
+  f->ts.cl = gfc_new_charlen (gfc_current_ns);
   f->ts.cl->length = gfc_int_expr (1);
 
   f->value.function.name = gfc_get_string (name, f->ts.kind,

diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c
index f16f8d3f72e6c116418b1ce56dc1988f71a2f097..425bd36275b8297207ba118e5ba3d79c77b95530 100644 (file)
--- a/gcc/fortran/module.c
+++ b/gcc/fortran/module.c
@@ -2000,13 +2000,9 @@ mio_charlen (gfc_charlen **clp)
     {
       if (peek_atom () != ATOM_RPAREN)
        {
-         cl = gfc_get_charlen ();
+         cl = gfc_new_charlen (gfc_current_ns);
          mio_expr (&cl->length);
-
          *clp = cl;
-
-         cl->next = gfc_current_ns->cl_list;
-         gfc_current_ns->cl_list = cl;
        }
     }
 

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 376803d69d994fb4726834e2c7cd90b42d6d2548..e09167b1be2ed7a1db122dae663a4fe65d305090 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -4012,11 +4012,7 @@ gfc_resolve_substring_charlen (gfc_expr *e)
   e->ts.kind = gfc_default_character_kind;
 
   if (!e->ts.cl)
-    {
-      e->ts.cl = gfc_get_charlen ();
-      e->ts.cl->next = gfc_current_ns->cl_list;
-      gfc_current_ns->cl_list = e->ts.cl;
-    }
+    e->ts.cl = gfc_new_charlen (gfc_current_ns);
 
   if (char_ref->u.ss.start)
     start = gfc_copy_expr (char_ref->u.ss.start);
@@ -4489,9 +4485,7 @@ gfc_resolve_character_operator (gfc_expr *e)
   else if (op2->expr_type == EXPR_CONSTANT)
     e2 = gfc_int_expr (op2->value.character.length);
 
-  e->ts.cl = gfc_get_charlen ();
-  e->ts.cl->next = gfc_current_ns->cl_list;
-  gfc_current_ns->cl_list = e->ts.cl;
+  e->ts.cl = gfc_new_charlen (gfc_current_ns);
 
   if (!e1 || !e2)
     return;
@@ -4530,11 +4524,7 @@ fixup_charlen (gfc_expr *e)
 
     default:
       if (!e->ts.cl)
-       {
-         e->ts.cl = gfc_get_charlen ();
-         e->ts.cl->next = gfc_current_ns->cl_list;
-         gfc_current_ns->cl_list = e->ts.cl;
-       }
+       e->ts.cl = gfc_new_charlen (gfc_current_ns);
 
       break;
     }
@@ -9085,16 +9075,10 @@ resolve_fl_derived (gfc_symbol *sym)
              /* Copy char length.  */
              if (ifc->ts.cl)
                {
-                 c->ts.cl = gfc_get_charlen();
+                 c->ts.cl = gfc_new_charlen (sym->ns);
                  c->ts.cl->resolved = ifc->ts.cl->resolved;
                  c->ts.cl->length = gfc_copy_expr (ifc->ts.cl->length);
                  /* TODO: gfc_expr_replace_symbols (c->ts.cl->length, c);*/
-                 /* Add charlen to namespace.  */
-                 /*if (c->formal_ns)
-                   {
-                     c->ts.cl->next = c->formal_ns->cl_list;
-                     c->formal_ns->cl_list = c->ts.cl;
-                   }*/
                }
            }
          else if (c->ts.interface->name[0] != '\0')
@@ -9490,16 +9474,10 @@ resolve_symbol (gfc_symbol *sym)
          /* Copy char length.  */
          if (ifc->ts.cl)
            {
-             sym->ts.cl = gfc_get_charlen();
+             sym->ts.cl = gfc_new_charlen (sym->ns);
              sym->ts.cl->resolved = ifc->ts.cl->resolved;
              sym->ts.cl->length = gfc_copy_expr (ifc->ts.cl->length);
              gfc_expr_replace_symbols (sym->ts.cl->length, sym);
-             /* Add charlen to namespace.  */
-             if (sym->formal_ns)
-               {
-                 sym->ts.cl->next = sym->formal_ns->cl_list;
-                 sym->formal_ns->cl_list = sym->ts.cl;
-               }
            }
        }
       else if (sym->ts.interface->name[0] != '\0')

diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c
index 0c1a2fdaad0186e6a572ab9f9aa5c0f55de48bd7..dd06e48a3058b11a78145e0e41b7f6cf099a5c78 100644 (file)
--- a/gcc/fortran/symbol.c
+++ b/gcc/fortran/symbol.c
@@ -3071,6 +3071,19 @@ gfc_free_finalizer_list (gfc_finalizer* list)
 }
 
 
+/* Create a new gfc_charlen structure and add it to a namespace.  */
+
+gfc_charlen*
+gfc_new_charlen (gfc_namespace *ns)
+{
+  gfc_charlen *cl;
+  cl = gfc_get_charlen ();
+  cl->next = ns->cl_list;
+  ns->cl_list = cl;
+  return cl;
+}
+
+
 /* Free the charlen list from cl to end (end is not freed). 
    Free the whole list if end is NULL.  */
 
@@ -3927,6 +3940,9 @@ gfc_copy_formal_args_intr (gfc_symbol *dest, gfc_intrinsic_sym *src)
       formal_arg->sym->attr.flavor = FL_VARIABLE;
       formal_arg->sym->attr.dummy = 1;
 
+      if (formal_arg->sym->ts.type == BT_CHARACTER)
+       formal_arg->sym->ts.cl = gfc_new_charlen (gfc_current_ns);
+
       /* If this isn't the first arg, set up the next ptr.  For the
         last arg built, the formal_arg->next will never get set to
         anything other than NULL.  */

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 671f681caf57a40106f34a11bc23920a7283b582..f6122c20624b55c84687e62f39729cf779d484d0 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-24  Janus Weil  <janus@gcc.gnu.org>
+
+       PR fortran/40822
+       * gfortran.dg/char_length_16.f90: New.
+
 2009-07-24  Jakub Jelinek  <jakub@redhat.com>
 
        PR fortran/40643

diff --git a/gcc/testsuite/gfortran.dg/char_length_16.f90 b/gcc/testsuite/gfortran.dg/char_length_16.f90
new file mode 100644 (file)
index 0000000..3ff14d2
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/char_length_16.f90
@@ -0,0 +1,12 @@
+! { dg-do compile }
+!
+! PR 40822: [4.5 Regression] Internal compiler error when Fortran intrinsic LEN referenced before explicit declaration
+!
+! Contributed by Mat Cross <mathewc@nag.co.uk>
+
+SUBROUTINE SEARCH(ITEMVAL)
+  CHARACTER (*) :: ITEMVAL
+  CHARACTER (LEN(ITEMVAL)) :: ITEM
+  INTRINSIC LEN
+END
+