summaryrefslogtreecommitdiff
path: root/gcc/fortran/interface.c
diff options
context:
space:
mode:
authorjanus <janus@138bc75d-0d04-0410-961f-82ee72b054a4>2009-07-27 18:26:34 +0000
committerjanus <janus@138bc75d-0d04-0410-961f-82ee72b054a4>2009-07-27 18:26:34 +0000
commit1c07b063c5dd7be4f220ffd1135f4ddc2034c238 (patch)
treef2377284b13d7bf04e368921ef58c67c590aba4e /gcc/fortran/interface.c
parentada30930a12b07dac1ea7e5d76fab3f184823243 (diff)
downloadgcc-1c07b063c5dd7be4f220ffd1135f4ddc2034c238.tar.gz
2009-07-27 Janus Weil <janus@gcc.gnu.org>
PR fortran/40848 * interface.c (gfc_compare_interfaces): Call 'count_types_test' before 'generic_correspondence', and only if checking a generic interface. 2009-07-27 Janus Weil <janus@gcc.gnu.org> PR fortran/40848 * gfortran.dg/altreturn_7.f90: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@150134 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran/interface.c')
-rw-r--r--gcc/fortran/interface.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c
index cedca457f0c..982aa290e22 100644
--- a/gcc/fortran/interface.c
+++ b/gcc/fortran/interface.c
@@ -983,6 +983,8 @@ gfc_compare_interfaces (gfc_symbol *s1, gfc_symbol *s2, int generic_flag,
if (generic_flag)
{
+ if (count_types_test (f1, f2) || count_types_test (f2, f1))
+ return 0;
if (generic_correspondence (f1, f2) || generic_correspondence (f2, f1))
return 0;
}
@@ -1034,13 +1036,6 @@ gfc_compare_interfaces (gfc_symbol *s1, gfc_symbol *s2, int generic_flag,
f2 = f2->next;
}
- if (count_types_test (f1, f2) || count_types_test (f2, f1))
- {
- if (errmsg != NULL)
- snprintf (errmsg, err_len, "Interface not matching");
- return 0;
- }
-
return 1;
}