procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libfortran/33055 (Runtime error in INQUIRE unit existance with -fdefault-integer-8)

Browse source 
2007-08-26  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR fortran/33055
	* trans-io.c (create_dummy_iostat): New function to create a unique
	dummy variable expression to use with IOSTAT.
	(gfc_trans_inquire): Use the new function to pass unit number error info
	to run-time library if a regular IOSTAT variable was not given.

	PR libfortran/33055
	* io/inquire.c (inquire_via_unit):  If inquiring by unit, check for 
	an error condition from the IOSTAT variable and set EXIST to false if
	there was a bad unit number.

From-SVN: r127817
This commit is contained in:
Jerry DeLisle 2007-08-26 22:04:48 +00:00
parent 070b797d0a
commit 128997b6a5
4 changed files with 61 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gcc/fortran/ChangeLog
View file

@ -1,3 +1,11 @@
2007-08-26 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR fortran/33055
* trans-io.c (create_dummy_iostat): New function to create a unique
dummy variable expression to use with IOSTAT.
(gfc_trans_inquire): Use the new function to pass unit number error info
to run-time library if a regular IOSTAT variable was not given.
2007-08-26 H.J. Lu <hongjiu.lu@intel.com>
* gfortran.h (gfc_isym_id): Add GFC_ISYM_GAMMA and

37
gcc/fortran/trans-io.c
View file

@ -1094,6 +1094,30 @@ 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;
st = gfc_get_unique_symtree (gfc_current_ns);
st->n.sym = gfc_new_symbol (st->name, gfc_current_ns);
st->n.sym->ts.type = BT_INTEGER;
st->n.sym->ts.kind = 4;
st->n.sym->attr.referenced = 1;
st->n.sym->refs = 1;
e = gfc_get_expr ();
e->expr_type = EXPR_VARIABLE;
e->symtree = st;
e->ts.type = BT_INTEGER;
e->ts.kind = 4;
return e;
}
/* Translate the non-IOLENGTH form of an INQUIRE statement. */
tree
@ -1133,8 +1157,17 @@ gfc_trans_inquire (gfc_code * code)
p->file);
if (p->exist)
mask |= set_parameter_ref (&block, &post_block, var, IOPARM_inquire_exist,
p->exist);
{
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)
mask |= set_parameter_ref (&block, &post_block, var, IOPARM_inquire_opened,

7
libgfortran/ChangeLog
View file

@ -1,3 +1,10 @@
2007-08-26 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libfortran/33055
* io/inquire.c (inquire_via_unit): If inquiring by unit, check for
an error condition from the IOSTAT variable and set EXIST to false if
there was a bad unit number.
2007-08-24 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/32972

12
libgfortran/io/inquire.c
View file

@ -47,7 +47,17 @@ inquire_via_unit (st_parameter_inquire *iqp, gfc_unit * u)
GFC_INTEGER_4 cf = iqp->common.flags;
if ((cf & IOPARM_INQUIRE_HAS_EXIST) != 0)
*iqp->exist = iqp->common.unit >= 0;
{
*iqp->exist = (iqp->common.unit >= 0
&& iqp->common.unit <= GFC_INTEGER_4_HUGE);
if ((cf & IOPARM_INQUIRE_HAS_FILE) == 0)
{
if (!(*iqp->exist))
*iqp->common.iostat = ERROR_BAD_UNIT;
*iqp->exist = *iqp->exist && (*iqp->common.iostat != ERROR_BAD_UNIT);
}
}
if ((cf & IOPARM_INQUIRE_HAS_OPENED) != 0)
*iqp->opened = (u != NULL);