re PR fortran/78239 (ICE in char_len_param_value, at fortran/decl.c:926, with -fimpli...

2016-12-17  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/78239
	* decl.c (char_len_param_value):  Actually commit
	previous change.

From-SVN: r243776

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index cf406eba3c888b25c84eba9974412cebf6b12ae1..7bb3bbc87da0d2221ce767cb9cc856e457dffec9 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,7 +1,14 @@
 2016-12-17  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
        PR fortran/78239
-       * decl.c(char_len_param_value): Also check for -fimplicit-none
+       * decl.c (char_len_param_value):  Actually commit
+       previous change.
+
+
+2016-12-17  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR fortran/78239
+       * decl.c( char_len_param_value): Also check for -fimplicit-none
        when determining if implicit none is in force.
 
 2016-12-16  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index c8adedb933ee88faa09109af002fd2422b026c17..aca32186229f4babd5b2142b52ea2d253eb5018e 100644 (file)
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -922,7 +922,8 @@ char_len_param_value (gfc_expr **expr, bool *deferred)
 
       if (!t && e->ts.type == BT_UNKNOWN
          && e->symtree->n.sym->attr.untyped == 1
-         && (e->symtree->n.sym->ns->seen_implicit_none == 1
+         && (flag_implicit_none
+             || e->symtree->n.sym->ns->seen_implicit_none == 1
              || e->symtree->n.sym->ns->parent->seen_implicit_none == 1))
        {
          gfc_free_expr (e);