OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR fortran/61765 ([F03] Rejects valid BIND(C) ENTRY) 

2019-01-12  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/61765
	* resolve.c (gfc_verify_binding_labels): Break if-elseif-elseif
	structure into independent if's with a return to simplify logic.
	Avoid a check for ENTRY name with bind(c).

2019-01-12  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/61765
	* gfortran.dg/pr61765.f90: New test.

From-SVN: r267902
This commit is contained in:
Steven G. Kargl 2019-01-13 04:02:46 +00:00
parent d6072c195d
commit 2642012168
4 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/fortran/ChangeLog
View File

@ -1,3 +1,10 @@
2019-01-12 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/61765
* resolve.c (gfc_verify_binding_labels): Break if-elseif-elseif
structure into independent if's with a return to simplify logic.
Avoid a check for ENTRY name with bind(c).
2019-01-12 Paul Thomas <pault@gcc.gnu.org>
* gfortran.texi : Add description in sections on TS 29113 and

25
gcc/fortran/resolve.c
View File

@ -11789,11 +11789,12 @@ gfc_verify_binding_labels (gfc_symbol *sym)
sym->binding_label, &sym->declared_at, &gsym->where);
/* Clear the binding label to prevent checking multiple times. */
sym->binding_label = NULL;
return;
}
else if (sym->attr.flavor == FL_VARIABLE && module
&& (strcmp (module, gsym->mod_name) != 0
|| strcmp (sym->name, gsym->sym_name) != 0))
if (sym->attr.flavor == FL_VARIABLE && module
&& (strcmp (module, gsym->mod_name) != 0
|| strcmp (sym->name, gsym->sym_name) != 0))
{
/* This can only happen if the variable is defined in a module - if it
isn't the same module, reject it. */
@ -11802,14 +11803,16 @@ gfc_verify_binding_labels (gfc_symbol *sym)
sym->name, module, sym->binding_label,
&sym->declared_at, &gsym->where, gsym->mod_name);
sym->binding_label = NULL;
return;
}
else if ((sym->attr.function || sym->attr.subroutine)
&& ((gsym->type != GSYM_SUBROUTINE && gsym->type != GSYM_FUNCTION)
|| (gsym->defined && sym->attr.if_source != IFSRC_IFBODY))
&& sym != gsym->ns->proc_name
&& (module != gsym->mod_name
|| strcmp (gsym->sym_name, sym->name) != 0
|| (module && strcmp (module, gsym->mod_name) != 0)))
if ((sym->attr.function || sym->attr.subroutine)
&& ((gsym->type != GSYM_SUBROUTINE && gsym->type != GSYM_FUNCTION)
|| (gsym->defined && sym->attr.if_source != IFSRC_IFBODY))
&& (sym != gsym->ns->proc_name && sym->attr.entry == 0)
&& (module != gsym->mod_name
|| strcmp (gsym->sym_name, sym->name) != 0
|| (module && strcmp (module, gsym->mod_name) != 0)))
{
/* Print an error if the procedure is defined multiple times; we have to
exclude references to the same procedure via module association or

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2019-01-12 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/61765
* gfortran.dg/pr61765.f90: New test.
2019-01-12 Paolo Carlini <paolo.carlini@oracle.com>
* g++.dg/cpp0x/pr62101.C: Test locations too.

15
gcc/testsuite/gfortran.dg/pr61765.f90 Normal file
View File

@ -0,0 +1,15 @@
! { dg-do compile }
subroutine sub1(x)
integer, intent(in) :: x
entry sub1_c(x) bind(c)
end subroutine sub1
subroutine sub2_c(x) bind(c)
integer, intent(in) :: x
entry sub2(x)
end subroutine sub2_c
subroutine sub3_c(x) bind(c)
integer, intent(in) :: x
entry sub3_c_c(x) bind(c)
end subroutine sub3_c