re PR fortran/61933 (Inquire on internal units)

2015-01-14  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR fortran/61933
	* io.c (gfc_match_inquire): Generate error if unit number in
	inquire statement is a constant -1.  All other values allowed.
	* trans-io.c (gfc_trans_inquire): Delete dummy iostat variable.
	(create_dummy_iostat): Delete function no longer used.

From-SVN: r219630

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 09fa75764880023f5572ea1e2d0a56e86ba2cef2..c7080b903434606f6d88c84c8450ff22a489d5d9 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,11 @@
+2015-01-14  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+       PR fortran/61933
+       * io.c (gfc_match_inquire): Generate error if unit number in
+       inquire statement is a constant -1.  All other values allowed.
+       * trans-io.c (gfc_trans_inquire): Delete dummy iostat variable.
+       (create_dummy_iostat): Delete function no longer used.
+
 2015-01-13  Jakub Jelinek  <jakub@redhat.com>
 
        PR fortran/64528

diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c
index 2bc80f30b7de9c598cc6bdc9c8b62fd82d5f26b2..a03984ca60747a999bb35c4a5c5a1851f4a16444 100644 (file)
--- a/gcc/fortran/io.c
+++ b/gcc/fortran/io.c
@@ -3998,6 +3998,14 @@ gfc_match_inquire (void)
       goto cleanup;
     }
 
+  if (inquire->unit != NULL && inquire->unit->expr_type == EXPR_CONSTANT
+      && inquire->unit->ts.type == BT_INTEGER
+      && mpz_get_si (inquire->unit->value.integer) == -1)
+    {
+      gfc_error ("UNIT number in INQUIRE statement at %L can not be -1", &loc);
+      goto cleanup;
+    }
+
   if (gfc_pure (NULL))
     {
       gfc_error ("INQUIRE statement not allowed in PURE procedure at %C");

diff --git a/gcc/fortran/trans-io.c b/gcc/fortran/trans-io.c
index ef37fcfc5c624a53afca35342138111f65d01ee3..e619acb5acee37fe37aa28d1b1c58d4903593e19 100644 (file)
--- a/gcc/fortran/trans-io.c
+++ b/gcc/fortran/trans-io.c
@@ -1186,33 +1186,6 @@ gfc_trans_flush (gfc_code * code)
 }
 
 
-/* Create a dummy iostat variable to catch any error due to bad unit.  */
-
-static gfc_expr *
-create_dummy_iostat (void)
-{
-  gfc_symtree *st;
-  gfc_expr *e;
-
-  gfc_get_ha_sym_tree ("@iostat", &st);
-  st->n.sym->ts.type = BT_INTEGER;
-  st->n.sym->ts.kind = gfc_default_integer_kind;
-  gfc_set_sym_referenced (st->n.sym);
-  gfc_commit_symbol (st->n.sym);
-  st->n.sym->backend_decl
-       = gfc_create_var (gfc_get_int_type (st->n.sym->ts.kind),
-                         st->n.sym->name);
-
-  e = gfc_get_expr ();
-  e->expr_type = EXPR_VARIABLE;
-  e->symtree = st;
-  e->ts.type = BT_INTEGER;
-  e->ts.kind = st->n.sym->ts.kind;
-
-  return e;
-}
-
-
 /* Translate the non-IOLENGTH form of an INQUIRE statement.  */
 
 tree
@@ -1255,13 +1228,6 @@ gfc_trans_inquire (gfc_code * code)
     {
       mask |= set_parameter_ref (&block, &post_block, var, IOPARM_inquire_exist,
                                 p->exist);
-
-      if (p->unit && !p->iostat)
-       {
-         p->iostat = create_dummy_iostat ();
-         mask |= set_parameter_ref (&block, &post_block, var,
-                                    IOPARM_common_iostat, p->iostat);
-       }
     }
 
   if (p->opened)