From 264201216816c9145e40b856628a6c3e3eec6178 Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Sun, 13 Jan 2019 04:02:46 +0000 Subject: re PR fortran/61765 ([F03] Rejects valid BIND(C) ENTRY) 2019-01-12 Steven G. Kargl 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 PR fortran/61765 * gfortran.dg/pr61765.f90: New test. From-SVN: r267902 --- gcc/fortran/resolve.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'gcc/fortran/resolve.c') diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index d18f2d8..155e7c9 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -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 -- cgit v1.1