* [PATCH] Fix PR77765
@ 2017-06-29 15:55 Cesar Philippidis
2017-06-29 17:36 ` Jakub Jelinek
0 siblings, 1 reply; 2+ messages in thread
From: Cesar Philippidis @ 2017-06-29 15:55 UTC (permalink / raw)
To: gcc-patches, Fortran List
[-- Attachment #1: Type: text/plain, Size: 629 bytes --]
PR77765 exposed an ICE triggered in gfortran's acc routine parser by an
uninitialized proc_name. That situation occurred because the function
containing the acc routine directive has an error, so
gfc_current_ns->proc_name was never set.
Although it could be argued that the acc routine parser should not run
if any errors have been detected inside the routine containing such a
directive, this patch just teaches gfc_match_oacc_routine to check for
the existence of gfc_current_ns->proc_name before comparing the
procedure's name with the routine name specified by the user.
Is this patch OK for trunk and gcc7?
Thanks,
Cesar
[-- Attachment #2: pr77765.diff --]
[-- Type: text/x-patch, Size: 1573 bytes --]
2017-06-29 Cesar Philippidis <cesar@codesourcery.com>
PR fortran/77765
gcc/fortran/
* openmp.c (gfc_match_oacc_routine): Check if proc_name exist before
comparing the routine name against it.
gcc/testsuite/
* gfortran.dg/goacc/pr77765.f90: New test.
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index 1d191d2..236ecb2 100644
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -2474,7 +2474,8 @@ gfc_match_oacc_routine (void)
if (st)
{
sym = st->n.sym;
- if (strcmp (sym->name, gfc_current_ns->proc_name->name) == 0)
+ if (gfc_current_ns->proc_name != NULL
+ && strcmp (sym->name, gfc_current_ns->proc_name->name) == 0)
sym = NULL;
}
else if (isym == NULL)
diff --git a/gcc/testsuite/gfortran.dg/goacc/pr77765.f90 b/gcc/testsuite/gfortran.dg/goacc/pr77765.f90
new file mode 100644
index 0000000..3819cf7
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/goacc/pr77765.f90
@@ -0,0 +1,19 @@
+! Test the presence of an ACC ROUTINE directive inside a function
+! containg an error.
+
+! { dg-do compile }
+
+module m
+contains
+ recursive function f(x)
+ end function f
+ recursive function f(x)
+ !$acc routine (f)
+ end function f
+end module m
+
+! { dg-error "Procedure 'f' at .1. is already defined" "" { target *-*-* } 8 }
+! { dg-error "Duplicate RECURSIVE attribute specified" "" { target *-*-* } 8 }
+! { dg-error ".1." "" { target *-*-* } 10 }
+! { dg-error "Unexpected ..ACC ROUTINE" "" { target *-*-* } 11 }
+! { dg-error "Expecting END MODULE statement" "" { target *-*-* } 12 }
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Fix PR77765
2017-06-29 15:55 [PATCH] Fix PR77765 Cesar Philippidis
@ 2017-06-29 17:36 ` Jakub Jelinek
0 siblings, 0 replies; 2+ messages in thread
From: Jakub Jelinek @ 2017-06-29 17:36 UTC (permalink / raw)
To: Cesar Philippidis; +Cc: gcc-patches, Fortran List
On Thu, Jun 29, 2017 at 08:54:54AM -0700, Cesar Philippidis wrote:
> PR77765 exposed an ICE triggered in gfortran's acc routine parser by an
> uninitialized proc_name. That situation occurred because the function
> containing the acc routine directive has an error, so
> gfc_current_ns->proc_name was never set.
>
> Although it could be argued that the acc routine parser should not run
> if any errors have been detected inside the routine containing such a
> directive, this patch just teaches gfc_match_oacc_routine to check for
> the existence of gfc_current_ns->proc_name before comparing the
> procedure's name with the routine name specified by the user.
>
> Is this patch OK for trunk and gcc7?
>
> Thanks,
> Cesar
> 2017-06-29 Cesar Philippidis <cesar@codesourcery.com>
>
> PR fortran/77765
> gcc/fortran/
> * openmp.c (gfc_match_oacc_routine): Check if proc_name exist before
> comparing the routine name against it.
>
> gcc/testsuite/
> * gfortran.dg/goacc/pr77765.f90: New test.
Ok, thanks.
Jakub
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-06-29 17:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-29 15:55 [PATCH] Fix PR77765 Cesar Philippidis
2017-06-29 17:36 ` Jakub Jelinek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).