aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorLouis Krupp <louis.krupp@zoho.com>2016-10-05 18:00:30 +0000
committerLouis Krupp <lkrupp@gcc.gnu.org>2016-10-05 18:00:30 +0000
commit6e48e779aba92a8d7e89210c2d98d9b2a65d9a36 (patch)
treebac7b301f95193aee0ec07c066e7d711aa374759 /gcc/fortran
parent04a324433515f0b1076cb84b2a8e27c2025cd9d4 (diff)
downloadgcc-6e48e779aba92a8d7e89210c2d98d9b2a65d9a36.zip
gcc-6e48e779aba92a8d7e89210c2d98d9b2a65d9a36.tar.gz
gcc-6e48e779aba92a8d7e89210c2d98d9b2a65d9a36.tar.bz2
re PR fortran/67524 (ICE on using implicit character instead of implicit none etc.)
2016-10-05 Louis Krupp <louis.krupp@zoho.com> PR fortran/67524 * gfortran.dg/pr67524.f90: New test. 2016-10-05 Louis Krupp <louis.krupp@zoho.com> PR fortran/67524 * resolve.c (resolve_symbol): Don't apply default type rules to mixed-entry master created for function entry points. From-SVN: r240797
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/resolve.c5
2 files changed, 10 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index e309724..e01c4bf 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2016-10-05 Louis Krupp <louis.krupp@zoho.com>
+
+ PR fortran/67524
+ * resolve.c (resolve_symbol): Don't apply default type rules to
+ mixed-entry master created for function entry points.
+
2016-09-30 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR fortran/66643
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 7b068f9..ddd9d74 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -13886,7 +13886,10 @@ resolve_symbol (gfc_symbol *sym)
/* The specific case of an external procedure should emit an error
in the case that there is no implicit type. */
if (!mp_flag)
- gfc_set_default_type (sym, sym->attr.external, NULL);
+ {
+ if (!sym->attr.mixed_entry_master)
+ gfc_set_default_type (sym, sym->attr.external, NULL);
+ }
else
{
/* Result may be in another namespace. */