TeamHeptaMirrors/gcc
1
0
Fork 1
mirror of https://github.com/gcc-mirror/gcc.git synced 2026-05-06 14:59:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

fortran: Fix false explicit-interface-required for ENTRY with volatile [PR96986]

Browse Source 
When resolving a call to an ENTRY procedure, the entry lookup that
replaces the master procedure's def_sym with the specific entry symbol
was inside the 'resolved != -1' block.  During recursive resolution the
namespace is marked resolved == -1, so the lookup was skipped and the
explicit interface check used the master procedure's combined formal
argument list instead of the entry's own formals.

Move the entry lookup after the resolution block so it runs regardless
of the namespace resolution state.

	PR fortran/96986

gcc/fortran/ChangeLog:

	* resolve.cc (resolve_global_procedure): Move entry symbol
	lookup outside the resolved != -1 block.

gcc/testsuite/ChangeLog:

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

Signed-off-by: Christopher Albert <albert@tugraz.at>
This commit is contained in:
Christopher Albert
2026-03-29 21:52:37 +02:00
committed by Jerry DeLisle
parent cfa0910d9c
commit 6be9db0008
2 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gcc/fortran/resolve.cc
View File

@@ -2787,17 +2787,22 @@ resolve_global_procedure (gfc_symbol *sym, locus *where, int sub)
/* This can happen if a binding name has been specified. */
if (gsym->binding_label && gsym->sym_name != def_sym->name)
gfc_find_symbol (gsym->sym_name, gsym->ns, 0, &def_sym);
}
if (def_sym->attr.entry_master || def_sym->attr.entry)
{
gfc_entry_list *entry;
for (entry = gsym->ns->entries; entry; entry = entry->next)
if (strcmp (entry->sym->name, sym->name) == 0)
{
def_sym = entry->sym;
break;
}
}
/* Look up the specific entry symbol so that interface checks use
the entry's own formal argument list, not the entry master's.
This must run even when resolved == -1 (recursive resolution in
progress), because def_sym starts as the namespace proc_name
which is the entry master with the combined formals. */
if (def_sym->attr.entry_master || def_sym->attr.entry)
{
gfc_entry_list *entry;
for (entry = gsym->ns->entries; entry; entry = entry->next)
if (strcmp (entry->sym->name, sym->name) == 0)
{
def_sym = entry->sym;
break;
}
}
if (sym->attr.function && !gfc_compare_types (&sym->ts, &def_sym->ts))

25
gcc/testsuite/gfortran.dg/pr96986.f90 Normal file
View File

@@ -0,0 +1,25 @@
! { dg-do compile }
! { dg-options "-std=legacy" }
!
! PR fortran/96986
! Calling an ENTRY with no volatile arguments incorrectly required an
! explicit interface because the volatile attribute from a sibling ENTRY
! was checked against the master procedure's combined formal list.
subroutine volatile_test ()
implicit none
integer, volatile :: va
entry fun_a()
return
entry fun_b(va)
call fun_c()
return
end subroutine volatile_test
subroutine fun_c ()
implicit none
call fun_a() ! Must not require explicit interface
return
end subroutine fun_c