OSDN Git Service

2008-01-17 H.J. Lu <hongjiu.lu@intel.com>
authorhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 18 Jan 2008 01:29:11 +0000 (01:29 +0000)
committerhjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 18 Jan 2008 01:29:11 +0000 (01:29 +0000)
PR fortran/33375
* symbol.c (free_common_tree): Renamed to ...
(gfc_free_common_tree): This.  Remove static.
(gfc_free_namespace): Updated.

* gfortran.h (gfc_free_common_tree): New.

* match.c (gfc_match_common): Call gfc_free_common_tree () with
gfc_current_ns->common_root and set gfc_current_ns->common_root
to NULL on syntax error.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@131621 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/fortran/ChangeLog
gcc/fortran/gfortran.h
gcc/fortran/match.c
gcc/fortran/symbol.c

index ff0e639..ad0ffcc 100644 (file)
@@ -1,3 +1,16 @@
+2008-01-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR fortran/33375
+       * symbol.c (free_common_tree): Renamed to ...
+       (gfc_free_common_tree): This.  Remove static.
+       (gfc_free_namespace): Updated.
+
+       * gfortran.h (gfc_free_common_tree): New.
+
+       * match.c (gfc_match_common): Call gfc_free_common_tree () with
+       gfc_current_ns->common_root and set gfc_current_ns->common_root
+       to NULL on syntax error.
+
 2008-01-18  Richard Sandiford  <rsandifo@nildram.co.uk>
 
        PR fortran/34686
index aac1f82..d5f0073 100644 (file)
@@ -2137,6 +2137,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 *);
+void gfc_free_common_tree (gfc_symtree *);
 void gfc_free_namespace (gfc_namespace *);
 
 void gfc_symbol_init_2 (void);
index ad636f9..f21748c 100644 (file)
@@ -2951,6 +2951,8 @@ done:
   return MATCH_YES;
 
 syntax:
+  gfc_free_common_tree (gfc_current_ns->common_root);
+  gfc_current_ns->common_root = NULL;
   gfc_syntax_error (ST_COMMON);
 
 cleanup:
index 7200806..a50ed26 100644 (file)
@@ -2726,14 +2726,14 @@ gfc_commit_symbol (gfc_symbol *sym)
 /* Recursive function that deletes an entire tree and all the common
    head structures it points to.  */
 
-static void
-free_common_tree (gfc_symtree * common_tree)
+void
+gfc_free_common_tree (gfc_symtree * common_tree)
 {
   if (common_tree == NULL)
     return;
 
-  free_common_tree (common_tree->left);
-  free_common_tree (common_tree->right);
+  gfc_free_common_tree (common_tree->left);
+  gfc_free_common_tree (common_tree->right);
 
   gfc_free (common_tree);
 }  
@@ -2863,7 +2863,7 @@ gfc_free_namespace (gfc_namespace *ns)
 
   free_sym_tree (ns->sym_root);
   free_uop_tree (ns->uop_root);
-  free_common_tree (ns->common_root);
+  gfc_free_common_tree (ns->common_root);
 
   for (cl = ns->cl_list; cl; cl = cl2)
     {