On Tue, Sep 25, 2018 at 10:57 AM Jakub Jelinek <ja...@redhat.com> wrote:
> For -m64, the last lock/unlock are: > _gfortran_caf_lock (four.token, (unsigned long) (1 - > four.dim[0].lbound), (integer(kind=4)) (7 - four.dim[1].lbound), > &acquired.11, &ii, 0B, 0); > _gfortran_caf_unlock (four.token, (unsigned long) (2 - > four.dim[0].lbound), (integer(kind=4)) (8 - four.dim[1].lbound), 0B, 0B, 0); > while for -m32, the last lock/unlock are: > _gfortran_caf_lock (four.token, (character(kind=4)) (1 - > four.dim[0].lbound), 7 - four.dim[1].lbound, &acquired.11, &ii, 0B, 0); > _gfortran_caf_unlock (four.token, (character(kind=4)) (2 - > four.dim[0].lbound), 8 - four.dim[1].lbound, 0B, 0B, 0); > The regexp expects either casts on both (which is why -m64 works), or no > casts on either, but not the case when there is a cast just on the second > argument and not on the third one. > > The following patch fixes it, tested with the above make check-gfortran. > > Note, there are still 4 spots that use .*, that looks dangerous to me, as > it > can match many lines. I'd suggest \[^\n\r]* instead. > > 2018-09-25 Jakub Jelinek <ja...@redhat.com> > > * gfortran.dg/coarray_lock_7.f90: Adjust scan-tree-dump-times for > ILP32. > > Thanks, Ok for trunk! -- Janne Blomqvist
