[Patch, libgfortran] Inquire internal unit within child dtio procedure

[Patch, libgfortran] Inquire internal unit within child dtio procedure

[JerryD]

Committed as trivial. Reported on c.l.f  Regression tested on x86-64.

Regards,

Jerry

2016-10-04  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	io/inquire.c (inquire_via_unit): Add check for internal unit
	passed into child IO procedure.

2016-10-04  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	* gfortran.dg/dtio_15.f90: New test.

r240766 = d59520df9fe83f1a9aea7e766cef52bf6ec790df (refs/remotes/svn/trunk)
	A	gcc/testsuite/gfortran.dg/dtio_15.f90
	M	libgfortran/ChangeLog
	M	libgfortran/io/inquire.c


diff --git a/libgfortran/io/inquire.c b/libgfortran/io/inquire.c
index 2bb518b6..7751b8df 100644
--- a/libgfortran/io/inquire.c
+++ b/libgfortran/io/inquire.c
@@ -41,7 +41,9 @@ inquire_via_unit (st_parameter_inquire *iqp, gfc_unit * u)
    const char *p;
    GFC_INTEGER_4 cf = iqp->common.flags;

-  if (iqp->common.unit == GFC_INTERNAL_UNIT || iqp->common.unit == 
GFC_INTERNAL_UNIT4)
+  if (iqp->common.unit == GFC_INTERNAL_UNIT ||
+       iqp->common.unit == GFC_INTERNAL_UNIT4 ||
+       u->internal_unit_kind != 0)
      generate_error (&iqp->common, LIBERROR_INQUIRE_INTERNAL_UNIT, NULL);

    if ((cf & IOPARM_INQUIRE_HAS_EXIST) != 0)

Re: [Patch, libgfortran] Inquire internal unit within child dtio procedure

[Jerry DeLisle]

On 10/05/2016 06:47 AM, Dominique d'Humières wrote:
> Dear Jerry,
>
>> Committed as trivial.
>
> Many things are trivial unless noted otherwise! The patch causes the following failures:
>
> FAIL: gfortran.dg/inquire_13.f90   -O0  execution test
> FAIL: gfortran.dg/inquire_15.f90   -O0  execution test
> FAIL: gfortran.dg/inquire_6.f90   -O0  execution test
> FAIL: gfortran.dg/inquire_9.f90   -O0  execution test
> FAIL: gfortran.dg/large_unit_2.f90   -O0  execution test
> FAIL: gfortran.dg/make_unit.f90   -O0  execution test
> FAIL: gfortran.dg/negative_unit.f   -O0  execution test
> FAIL: gfortran.dg/negative_unit_int8.f   -O0  execution test
> FAIL: gfortran.dg/pr20950.f   -O0  execution test
>
> see, e.g., https://gcc.gnu.org/ml/gcc-testresults/2016-10/msg00375.html.
>
> Also the test gfortran.dg/dtio_15.f90 succeeds even with revision r240768 reverted.
>
> Thanks for working on the issue while waiting for the four character fix!
>
> Dominique
>

My haste got me. I did regression test so I must have done something wrong when 
I ran the tests, maybe in the wrong build directory, I only have about 10 of 
them here.

I am pretty sure I know whats wrong so will fix it shortly.

Jerry



Jerry

Re: [Patch, libgfortran] Inquire internal unit within child dtio procedure

[Dominique d'Humières]

Dear Jerry,

> Committed as trivial.

Many things are trivial unless noted otherwise! The patch causes the following failures:

FAIL: gfortran.dg/inquire_13.f90   -O0  execution test
FAIL: gfortran.dg/inquire_15.f90   -O0  execution test
FAIL: gfortran.dg/inquire_6.f90   -O0  execution test
FAIL: gfortran.dg/inquire_9.f90   -O0  execution test
FAIL: gfortran.dg/large_unit_2.f90   -O0  execution test
FAIL: gfortran.dg/make_unit.f90   -O0  execution test
FAIL: gfortran.dg/negative_unit.f   -O0  execution test
FAIL: gfortran.dg/negative_unit_int8.f   -O0  execution test
FAIL: gfortran.dg/pr20950.f   -O0  execution test

see, e.g., https://gcc.gnu.org/ml/gcc-testresults/2016-10/msg00375.html.

Also the test gfortran.dg/dtio_15.f90 succeeds even with revision r240768 reverted.

Thanks for working on the issue while waiting for the four character fix!

Dominique