From: Jerry DeLisle <jvdelisle@gcc.gnu.org>
Date: Sun, 29 Jan 2023 04:00:34 +0000 (-0800)
Subject: Fortran: ICE in gfc_free_namespace. ice-on-invalid.
X-Git-Tag: releases/gcc-12.3.0~197
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d2860f933cc01668272e0aaa354aa96899b3a82;p=thirdparty%2Fgcc.git

Fortran: 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.

(cherry picked from commit 8011fbba7baa46947341ca8069b5a327163a68d5)
---

diff --git a/gcc/fortran/parse.cc b/gcc/fortran/parse.cc
index c220913e72cd..530f2075745a 100644
--- a/gcc/fortran/parse.cc
+++ b/gcc/fortran/parse.cc
@@ -6453,7 +6453,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))
@@ -6476,7 +6475,6 @@ parse_module (void)
 
   st = parse_spec (ST_NONE);
 
-  error = false;
 loop:
   switch (st)
     {
@@ -6495,16 +6493,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 000000000000..3f57809e0999
--- /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