From: Harald Anlauf <anlauf@gmx.de>
Date: Sun, 17 Feb 2019 21:19:20 +0000 (+0000)
Subject: re PR fortran/88299 ([F18] COMMON in a legacy module produces bogus warnings in depen... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0f7cec0982a2866f36d17e2ac1c1b05d69e6154d;p=gcc.git

re PR fortran/88299 ([F18] COMMON in a legacy module produces bogus warnings in dependent code)

2019-02-17  Harald Anlauf  <anlauf@gmx.de>

	PR fortran/88299
	* resolve.c (resolve_common_blocks,resolve_common_vars): Move
	check for obsolent COMMON feature in F2018 to better place.

	PR fortran/88299
	* gfortran.dg/pr88299.f90: New test.

From-SVN: r268974
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index aa474a44160..4f150e257eb 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2019-02-17  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/88299
+	* resolve.c (resolve_common_blocks,resolve_common_vars): Move
+	check for obsolent COMMON feature in F2018 to better place.
+
 2019-02-17  Harald Anlauf  <anlauf@gmx.de>
 
 	PR fortran/89077
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index e215fef2be5..e581a60f157 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -940,7 +940,11 @@ resolve_common_vars (gfc_common_head *common_block, bool named_common)
 	 have been ignored to continue parsing.
 	 We do the checks again here.  */
       if (!csym->attr.use_assoc)
-	gfc_add_in_common (&csym->attr, csym->name, &common_block->where);
+	{
+	  gfc_add_in_common (&csym->attr, csym->name, &common_block->where);
+	  gfc_notify_std (GFC_STD_F2018_OBS, "COMMON block at %L",
+			  &common_block->where);
+	}
 
       if (csym->value || csym->attr.data)
 	{
@@ -998,10 +1002,6 @@ resolve_common_blocks (gfc_symtree *common_root)
 
   resolve_common_vars (common_root->n.common, true);
 
-  if (!gfc_notify_std (GFC_STD_F2018_OBS, "COMMON block at %L",
-		       &common_root->n.common->where))
-    return;
-
   /* The common name is a global name - in Fortran 2003 also if it has a
      C binding name, since Fortran 2008 only the C binding name is a global
      identifier.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6b2ffa3f022..9b197cc7947 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-02-17  Harald Anlauf  <anlauf@gmx.de>
+
+	PR fortran/88299
+	* gfortran.dg/pr88299.f90: New test.
+
 2019-02-17  Harald Anlauf  <anlauf@gmx.de>
 
 	PR fortran/89077
diff --git a/gcc/testsuite/gfortran.dg/pr88299.f90 b/gcc/testsuite/gfortran.dg/pr88299.f90
new file mode 100644
index 00000000000..5471d40ea38
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr88299.f90
@@ -0,0 +1,16 @@
+! { dg-do compile }
+! { dg-options "-std=f2018" }
+!
+! PR 85839: [F18] COMMON in a legacy module produces bogus warnings
+!           in dependent code
+
+module legacy
+  integer :: major, n
+  common /version/ major  ! { dg-warning "obsolescent feature" }
+  public  :: n
+  private
+end module legacy
+
+module mod1
+  use legacy, only: n     ! No warning expected here
+end module mod1