diff mbox series

[fortran] PR103506 [10/11/12/13 Regression] ICE in gfc_free_namespace, at fortran/symbol.c

Message ID 56d431f3-a8d5-a122-41e6-df472c41b326@protonmail.com
State New
Headers show
Series [fortran] PR103506 [10/11/12/13 Regression] ICE in gfc_free_namespace, at fortran/symbol.c | expand

Commit Message

Jerry DeLisle Jan. 29, 2023, 4:17 a.m. UTC 
Attached patch fixes this problem by allowing the namespace pointer to
be set correctly regardless of error condition.

Regression tested on x86_64_linux_gnu.

OK for trunk and backports?

Regards,

Jerry

Author: Jerry DeLisle <jvdelisle@gcc.gnu.org>
Date:   Sat Jan 28 20:00:34 2023 -0800

     ICE in gfc_free_namespace. ice-on-invalid.

             PR fortran/103506

     gcc/fortran/ChangeLog:

             * parse.cc (parse_module): Remove use of a bool error value
             that prevented proper setting of the namespace pointer.

     gcc/testsuite/ChangeLog:

             * gfortran.dg/pr103506_1.f90: New test.

Comments

Mikael Morin Jan. 29, 2023, 4:27 p.m. UTC | #1 
Le 29/01/2023 à 05:17, Jerry DeLisle via Fortran a écrit :
> Attached patch fixes this problem by allowing the namespace pointer to
> be set correctly regardless of error condition.
> 
> Regression tested on x86_64_linux_gnu.
> 
> OK for trunk and backports?
> 
Yes, thanks.
diff mbox series

Patch

diff --git a/gcc/fortran/parse.cc b/gcc/fortran/parse.cc
index 0fb19cc9f0f..039e7e7da53 100644
--- a/gcc/fortran/parse.cc
+++ b/gcc/fortran/parse.cc
@@ -6502,7 +6502,6 @@  parse_module (void)
 {
   gfc_statement st;
   gfc_gsymbol *s;
-  bool error;
 
   s = gfc_get_gsymbol (gfc_new_block->name, false);
   if (s->defined || (s->type != GSYM_UNKNOWN && s->type != GSYM_MODULE))
@@ -6525,7 +6524,6 @@  parse_module (void)
 
   st = parse_spec (ST_NONE);
 
-  error = false;
 loop:
   switch (st)
     {
@@ -6544,16 +6542,11 @@  loop:
     default:
       gfc_error ("Unexpected %s statement in MODULE at %C",
 		 gfc_ascii_statement (st));
-
-      error = true;
       reject_statement ();
       st = next_statement ();
       goto loop;
     }
-
-  /* Make sure not to free the namespace twice on error.  */
-  if (!error)
-    s->ns = gfc_current_ns;
+  s->ns = gfc_current_ns;
 }
 
 
diff --git a/gcc/testsuite/gfortran.dg/pr103506_1.f90 b/gcc/testsuite/gfortran.dg/pr103506_1.f90
new file mode 100644
index 00000000000..3f57809e099
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr103506_1.f90
@@ -0,0 +1,9 @@ 
+! { dg-do compile }
+! PR103506 ICE in gfc_free_namespace. ice-on-invalid
+! Test case from the PR.
+module m ! { dg-error "is already being used as a MODULE" }
+stop ! { dg-error "Unexpected STOP statement in MODULE" }
+end
+program p
+call m ! { dg-error "is already being used as a MODULE" }
+end