[gcc(refs/vendors/ibm/heads/gcc-9-branch)] Fortran : Spurious warning message with -Wsurprising PR59107
Peter Bergner
bergner@gcc.gnu.org
Fri Sep 4 19:10:05 GMT 2020
https://gcc.gnu.org/g:5a17beaecadf10d1c9c44d2b31eedc11dfdea35a
commit 5a17beaecadf10d1c9c44d2b31eedc11dfdea35a
Author: Mark Eggleston <markeggleston@gcc.gnu.org>
Date: Mon May 11 12:38:14 2020 +0100
Fortran : Spurious warning message with -Wsurprising PR59107
This change is from a patch developed for gcc-5. The code
has moved on since then requiring a change to interface.c
2020-05-11 Mark Eggleston <markeggleston@gcc.gnu.org>
Backported from mainline
2020-05-11 Janus Weil <janus@gcc.gnu.org>
Dominique d'Humieres <dominiq@lps.ens.fr>
gcc/fortran/
PR fortran/59107
* gfortran.h: Rename field resolved as resolve_symbol_called
and assign two 2 bits instead of 1.
* interface.c (gfc_find_typebound_dtio_proc): Use new field name.
* resolve.c (gfc_resolve_intrinsic): Replace check of the formal
field with resolve_symbol_called is at least 2, if it is not
set the field to 2. (resolve_typebound_procedure): Use new field
name. (resolve_symbol): Use new field name and check whether it
is at least 1, if it is not set the field to 1.
Backported from mainline
2020-05-11 Mark Eggleston <markeggleston@gcc.gnu.org>
gcc/testsuite/
PR fortran/59107
* gfortran.dg/pr59107.f90: New test.
Diff:
---
gcc/fortran/ChangeLog | 16 ++++++++++++++++
gcc/fortran/gfortran.h | 5 ++++-
gcc/fortran/interface.c | 3 ++-
gcc/fortran/resolve.c | 10 ++++++----
gcc/testsuite/ChangeLog | 8 ++++++++
gcc/testsuite/gfortran.dg/pr59107.f90 | 11 +++++++++++
6 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 21f8b1afa79..2255be74128 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,19 @@
+2020-05-11 Mark Eggleston <markeggleston@gcc.gnu.org>
+
+ Backported from mainline
+ 2020-05-11 Janus Weil <janus@gcc.gnu.org>
+ Dominique d'Humieres <dominiq@lps.ens.fr>
+
+ PR fortran/59107
+ * gfortran.h: Rename field resolved as resolve_symbol_called
+ and assign two 2 bits instead of 1.
+ * interface.c (gfc_find_typebound_dtio_proc): Use new field name.
+ * resolve.c (gfc_resolve_intrinsic): Replace check of the formal
+ field with resolve_symbol_called is at least 2, if it is not
+ set the field to 2. (resolve_typebound_procedure): Use new field
+ name. (resolve_symbol): Use new field name and check whether it
+ is at least 1, if it is not set the field to 1.
+
2020-05-04 Tobias Burnus <tobias@codesourcery.com>
Backport from mainline.
diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h
index d7071ae5fcf..a3320d890cd 100644
--- a/gcc/fortran/gfortran.h
+++ b/gcc/fortran/gfortran.h
@@ -1602,7 +1602,10 @@ typedef struct gfc_symbol
/* Set if the symbol is used in a function result specification . */
unsigned fn_result_spec:1;
/* Used to avoid multiple resolutions of a single symbol. */
- unsigned resolved:1;
+ /* = 2 if this has already been resolved as an intrinsic,
+ in gfc_resolve_intrinsic,
+ = 1 if it has been resolved in resolve_symbol. */
+ unsigned resolve_symbol_called:2;
/* Set if this is a module function or subroutine with the
abreviated declaration in a submodule. */
unsigned abr_modproc_decl:1;
diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c
index b5701b1a59a..29af409dde0 100644
--- a/gcc/fortran/interface.c
+++ b/gcc/fortran/interface.c
@@ -4979,7 +4979,8 @@ gfc_find_typebound_dtio_proc (gfc_symbol *derived, bool write, bool formatted)
gfc_symtree *tb_io_st = NULL;
bool t = false;
- if (!derived || !derived->resolved || derived->attr.flavor != FL_DERIVED)
+ if (!derived || !derived->resolve_symbol_called
+ || derived->attr.flavor != FL_DERIVED)
return NULL;
/* Try to find a typebound DTIO binding. */
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index c041d8df96d..0e594ffadb0 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -1754,9 +1754,11 @@ gfc_resolve_intrinsic (gfc_symbol *sym, locus *loc)
gfc_intrinsic_sym* isym = NULL;
const char* symstd;
- if (sym->formal)
+ if (sym->resolve_symbol_called >= 2)
return true;
+ sym->resolve_symbol_called = 2;
+
/* Already resolved. */
if (sym->from_intmod && sym->ts.type != BT_UNKNOWN)
return true;
@@ -13570,7 +13572,7 @@ resolve_typebound_procedure (gfc_symtree* stree)
{
/* If proc has not been resolved at this point, proc->name may
actually be a USE associated entity. See PR fortran/89647. */
- if (!proc->resolved
+ if (!proc->resolve_symbol_called
&& proc->attr.function == 0 && proc->attr.subroutine == 0)
{
gfc_symbol *tmp;
@@ -14820,9 +14822,9 @@ resolve_symbol (gfc_symbol *sym)
gfc_array_spec *as;
bool saved_specification_expr;
- if (sym->resolved)
+ if (sym->resolve_symbol_called >= 1)
return;
- sym->resolved = 1;
+ sym->resolve_symbol_called = 1;
/* No symbol will ever have union type; only components can be unions.
Union type declaration symbols have type BT_UNKNOWN but flavor FL_UNION
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 02b5dbc6ea8..a3dc4a9748a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2020-05-11 Mark Eggleston <markeggleston@gcc.gnu.org>
+
+ Backported from mainline
+ 2020-05-11 Mark Eggleston <markeggleston@gcc.gnu.org>
+
+ PR fortran/59107
+ * gfortran.dg/pr59107.f90: New test.
+
2020-05-07 Jakub Jelinek <jakub@redhat.com>
PR c++/94946
diff --git a/gcc/testsuite/gfortran.dg/pr59107.f90 b/gcc/testsuite/gfortran.dg/pr59107.f90
new file mode 100644
index 00000000000..a84328f0851
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr59107.f90
@@ -0,0 +1,11 @@
+! { dg-compile }
+! { dg-options "-Wsurprising" }
+
+! There should be no surprising warnings
+
+program p
+ Integer :: nargs
+ intrinsic :: command_argument_count
+ nargs = command_argument_count()
+end
+
More information about the Gcc-cvs
mailing list