[fortran] PR109451 - ICE in gfc_conv_expr_descriptor with ASSOCIATE and substrings
Checks
Commit Message
Hi All,
I think that the changelog says it all. OK for mainline?
Paul
Fortran: Fix some deferred character problems in associate [PR109451]
2023-04-07 Paul Thomas <pault@gcc.gnu.org>
gcc/fortran
PR fortran/109451
* trans-array.cc (gfc_conv_expr_descriptor): Guard expression
character length backend decl before using it. Suppress the
assignment if lhs equals rhs.
* trans-io.cc (gfc_trans_transfer): Scalarize transfer of
associate variables pointing to a variable. Add comment.
gcc/testsuite/
PR fortran/109451
* gfortran.dg/associate_61.f90 : New test
Comments
Hi Paul,
On 4/12/23 17:25, Paul Richard Thomas via Gcc-patches wrote:
> Hi All,
>
> I think that the changelog says it all. OK for mainline?
this looks almost fine, but still fails if one directly uses the
dummy argument as the ASSOCIATE target, as in:
program p
implicit none
character(4) :: c(2) = ["abcd","efgh"]
call dcs0 (c)
! call dcs0 (["abcd","efgh"])
contains
subroutine dcs0(a)
character(len=*), intent(in) :: a(:)
print *, size(a),len(a)
associate (q => a(:))
print *, size(q),len(q)
end associate
associate (q => a(:)(:))
print *, size(q),len(q)
end associate
return
end subroutine dcs0
end
This prints e.g.
2 4
2 0
2 0
(sometimes I also get junk values for the character length).
Can you please have another look?
Thanks,
Harald
> Paul
>
> Fortran: Fix some deferred character problems in associate [PR109451]
>
> 2023-04-07 Paul Thomas <pault@gcc.gnu.org>
>
> gcc/fortran
> PR fortran/109451
> * trans-array.cc (gfc_conv_expr_descriptor): Guard expression
> character length backend decl before using it. Suppress the
> assignment if lhs equals rhs.
> * trans-io.cc (gfc_trans_transfer): Scalarize transfer of
> associate variables pointing to a variable. Add comment.
>
>
> gcc/testsuite/
> PR fortran/109451
> * gfortran.dg/associate_61.f90 : New test
Hi Harald,
That's interesting - the string length '.q' is not set for either of the
associate blocks. I'm onto it.
Thanks
Paul
On Wed, 12 Apr 2023 at 20:26, Harald Anlauf <anlauf@gmx.de> wrote:
> Hi Paul,
>
> On 4/12/23 17:25, Paul Richard Thomas via Gcc-patches wrote:
> > Hi All,
> >
> > I think that the changelog says it all. OK for mainline?
>
> this looks almost fine, but still fails if one directly uses the
> dummy argument as the ASSOCIATE target, as in:
>
> program p
> implicit none
> character(4) :: c(2) = ["abcd","efgh"]
> call dcs0 (c)
> ! call dcs0 (["abcd","efgh"])
> contains
> subroutine dcs0(a)
> character(len=*), intent(in) :: a(:)
> print *, size(a),len(a)
> associate (q => a(:))
> print *, size(q),len(q)
> end associate
> associate (q => a(:)(:))
> print *, size(q),len(q)
> end associate
> return
> end subroutine dcs0
> end
>
> This prints e.g.
>
> 2 4
> 2 0
> 2 0
>
> (sometimes I also get junk values for the character length).
>
> Can you please have another look?
>
> Thanks,
> Harald
>
>
> > Paul
> >
> > Fortran: Fix some deferred character problems in associate [PR109451]
> >
> > 2023-04-07 Paul Thomas <pault@gcc.gnu.org>
> >
> > gcc/fortran
> > PR fortran/109451
> > * trans-array.cc (gfc_conv_expr_descriptor): Guard expression
> > character length backend decl before using it. Suppress the
> > assignment if lhs equals rhs.
> > * trans-io.cc (gfc_trans_transfer): Scalarize transfer of
> > associate variables pointing to a variable. Add comment.
> >
> >
> > gcc/testsuite/
> > PR fortran/109451
> > * gfortran.dg/associate_61.f90 : New test
>
>
Hi Harald,
The fix was trivial. An updated patch and testcase are attached.
Thanks
Paul
Fortran: Fix some deferred character problems in associate [PR109451]
2023-04-14 Paul Thomas <pault@gcc.gnu.org>
gcc/fortran
PR fortran/109451
* trans-array.cc (gfc_conv_expr_descriptor): Guard expression
character length backend decl before using it. Suppress the
assignment if lhs equals rhs.
* trans-io.cc (gfc_trans_transfer): Scalarize transfer of
associate variables pointing to a variable. Add comment.
* trans-stmt.cc (trans_associate_var): Remove requirement that
the character length be deferred before assigning the value
returned by gfc_conv_expr_descriptor. Also, guard the backend
decl before testing with VAR_P.
gcc/testsuite/
PR fortran/109451
* gfortran.dg/associate_61.f90 : New test
On Thu, 13 Apr 2023 at 07:18, Paul Richard Thomas <
paul.richard.thomas@gmail.com> wrote:
> Hi Harald,
>
> That's interesting - the string length '.q' is not set for either of the
> associate blocks. I'm onto it.
>
> Thanks
>
> Paul
>
>
> On Wed, 12 Apr 2023 at 20:26, Harald Anlauf <anlauf@gmx.de> wrote:
>
>> Hi Paul,
>>
>> On 4/12/23 17:25, Paul Richard Thomas via Gcc-patches wrote:
>> > Hi All,
>> >
>> > I think that the changelog says it all. OK for mainline?
>>
>> this looks almost fine, but still fails if one directly uses the
>> dummy argument as the ASSOCIATE target, as in:
>>
>> program p
>> implicit none
>> character(4) :: c(2) = ["abcd","efgh"]
>> call dcs0 (c)
>> ! call dcs0 (["abcd","efgh"])
>> contains
>> subroutine dcs0(a)
>> character(len=*), intent(in) :: a(:)
>> print *, size(a),len(a)
>> associate (q => a(:))
>> print *, size(q),len(q)
>> end associate
>> associate (q => a(:)(:))
>> print *, size(q),len(q)
>> end associate
>> return
>> end subroutine dcs0
>> end
>>
>> This prints e.g.
>>
>> 2 4
>> 2 0
>> 2 0
>>
>> (sometimes I also get junk values for the character length).
>>
>> Can you please have another look?
>>
>> Thanks,
>> Harald
>>
>>
>> > Paul
>> >
>> > Fortran: Fix some deferred character problems in associate [PR109451]
>> >
>> > 2023-04-07 Paul Thomas <pault@gcc.gnu.org>
>> >
>> > gcc/fortran
>> > PR fortran/109451
>> > * trans-array.cc (gfc_conv_expr_descriptor): Guard expression
>> > character length backend decl before using it. Suppress the
>> > assignment if lhs equals rhs.
>> > * trans-io.cc (gfc_trans_transfer): Scalarize transfer of
>> > associate variables pointing to a variable. Add comment.
>> >
>> >
>> > gcc/testsuite/
>> > PR fortran/109451
>> > * gfortran.dg/associate_61.f90 : New test
>>
>>
>
> --
> "If you can't explain it simply, you don't understand it well enough" -
> Albert Einstein
>
Hi Paul,
On 4/14/23 10:18, Paul Richard Thomas via Gcc-patches wrote:
> Hi Harald,
>
> The fix was trivial. An updated patch and testcase are attached.
great, this works, and I couldn't break it again this time ...
Looks good!
Thanks,
Harald
> Thanks
>
> Paul
>
> Fortran: Fix some deferred character problems in associate [PR109451]
>
> 2023-04-14 Paul Thomas <pault@gcc.gnu.org>
>
> gcc/fortran
> PR fortran/109451
> * trans-array.cc (gfc_conv_expr_descriptor): Guard expression
> character length backend decl before using it. Suppress the
> assignment if lhs equals rhs.
> * trans-io.cc (gfc_trans_transfer): Scalarize transfer of
> associate variables pointing to a variable. Add comment.
> * trans-stmt.cc (trans_associate_var): Remove requirement that
> the character length be deferred before assigning the value
> returned by gfc_conv_expr_descriptor. Also, guard the backend
> decl before testing with VAR_P.
>
> gcc/testsuite/
> PR fortran/109451
> * gfortran.dg/associate_61.f90 : New test
>
>
> On Thu, 13 Apr 2023 at 07:18, Paul Richard Thomas <
> paul.richard.thomas@gmail.com> wrote:
>
>> Hi Harald,
>>
>> That's interesting - the string length '.q' is not set for either of the
>> associate blocks. I'm onto it.
>>
>> Thanks
>>
>> Paul
>>
>>
>> On Wed, 12 Apr 2023 at 20:26, Harald Anlauf <anlauf@gmx.de> wrote:
>>
>>> Hi Paul,
>>>
>>> On 4/12/23 17:25, Paul Richard Thomas via Gcc-patches wrote:
>>>> Hi All,
>>>>
>>>> I think that the changelog says it all. OK for mainline?
>>>
>>> this looks almost fine, but still fails if one directly uses the
>>> dummy argument as the ASSOCIATE target, as in:
>>>
>>> program p
>>> implicit none
>>> character(4) :: c(2) = ["abcd","efgh"]
>>> call dcs0 (c)
>>> ! call dcs0 (["abcd","efgh"])
>>> contains
>>> subroutine dcs0(a)
>>> character(len=*), intent(in) :: a(:)
>>> print *, size(a),len(a)
>>> associate (q => a(:))
>>> print *, size(q),len(q)
>>> end associate
>>> associate (q => a(:)(:))
>>> print *, size(q),len(q)
>>> end associate
>>> return
>>> end subroutine dcs0
>>> end
>>>
>>> This prints e.g.
>>>
>>> 2 4
>>> 2 0
>>> 2 0
>>>
>>> (sometimes I also get junk values for the character length).
>>>
>>> Can you please have another look?
>>>
>>> Thanks,
>>> Harald
>>>
>>>
>>>> Paul
>>>>
>>>> Fortran: Fix some deferred character problems in associate [PR109451]
>>>>
>>>> 2023-04-07 Paul Thomas <pault@gcc.gnu.org>
>>>>
>>>> gcc/fortran
>>>> PR fortran/109451
>>>> * trans-array.cc (gfc_conv_expr_descriptor): Guard expression
>>>> character length backend decl before using it. Suppress the
>>>> assignment if lhs equals rhs.
>>>> * trans-io.cc (gfc_trans_transfer): Scalarize transfer of
>>>> associate variables pointing to a variable. Add comment.
>>>>
>>>>
>>>> gcc/testsuite/
>>>> PR fortran/109451
>>>> * gfortran.dg/associate_61.f90 : New test
>>>
>>>
>>
>> --
>> "If you can't explain it simply, you don't understand it well enough" -
>> Albert Einstein
>>
>
>
@@ -7934,8 +7934,12 @@ gfc_conv_expr_descriptor (gfc_se *se, gfc_expr *expr)
else
tmp = se->string_length;
- if (expr->ts.deferred && VAR_P (expr->ts.u.cl->backend_decl))
- gfc_add_modify (&se->pre, expr->ts.u.cl->backend_decl, tmp);
+ if (expr->ts.deferred && expr->ts.u.cl->backend_decl
+ && VAR_P (expr->ts.u.cl->backend_decl))
+ {
+ if (expr->ts.u.cl->backend_decl != tmp)
+ gfc_add_modify (&se->pre, expr->ts.u.cl->backend_decl, tmp);
+ }
else
expr->ts.u.cl->backend_decl = tmp;
}
@@ -2620,9 +2620,13 @@ gfc_trans_transfer (gfc_code * code)
gcc_assert (ref && ref->type == REF_ARRAY);
}
+ /* These expressions don't always have the dtype element length set
+ correctly, rendering them useless for array transfer. */
if (expr->ts.type != BT_CLASS
&& expr->expr_type == EXPR_VARIABLE
&& ((expr->symtree->n.sym->ts.type == BT_DERIVED && expr->ts.deferred)
+ || (expr->symtree->n.sym->assoc
+ && expr->symtree->n.sym->assoc->variable)
|| gfc_expr_attr (expr).pointer))
goto scalarize;