From b30c6a0d2177a1d28b7c320afffd12a1cafcc4bb Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 13 Nov 2006 20:42:55 +0100 Subject: [PATCH] re PR fortran/29759 (ice on line continuation in OMP statements (gfc_next_char_literal, at fortran/scanner.c:701)) PR fortran/29759 * fortran/scanner.c (skip_free_comments): Clear openmp_flag before returning true. * gfortran.dg/gomp/pr29759.f90: New test. From-SVN: r118773 --- gcc/fortran/ChangeLog | 6 ++++ gcc/fortran/scanner.c | 1 + gcc/testsuite/ChangeLog | 5 +++ gcc/testsuite/gfortran.dg/gomp/pr29759.f90 | 42 ++++++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/gomp/pr29759.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 3cd8b11641f..2ba9e874c96 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2006-11-13 Jakub Jelinek + + PR fortran/29759 + * fortran/scanner.c (skip_free_comments): Clear openmp_flag + before returning true. + 2006-11-12 Andrew Pinski PR fortran/26994 diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c index 9d0ba2a492b..b05490409b1 100644 --- a/gcc/fortran/scanner.c +++ b/gcc/fortran/scanner.c @@ -392,6 +392,7 @@ skip_free_comments (void) { gfc_current_locus = old_loc; next_char (); + openmp_flag = 0; return true; } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 88f8c59bdf6..b058a6df942 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-11-13 Jakub Jelinek + + PR fortran/29759 + * gfortran.dg/gomp/pr29759.f90: New test. + 2006-11-13 Mark Mitchell PR c++/29518 diff --git a/gcc/testsuite/gfortran.dg/gomp/pr29759.f90 b/gcc/testsuite/gfortran.dg/gomp/pr29759.f90 new file mode 100644 index 00000000000..19a19c978ae --- /dev/null +++ b/gcc/testsuite/gfortran.dg/gomp/pr29759.f90 @@ -0,0 +1,42 @@ +! PR fortran/29759 +! { dg-do compile } + +PROGRAM test_omp +!$OMP PARALLEL & +!$OMP NUM_THREADS(2) +!$OMP END PARALLEL + +!$OMP PARALLEL & +!$OMP & NUM_THREADS(2) +!$OMP END PARALLEL + +!$OMP PARALLEL & +! +!$OMP NUM_THREADS(2) +!$OMP END PARALLEL + +!$OMP PARALLEL & +! +!$OMP & NUM_THREADS(2) +!$OMP END PARALLEL + + +!$OMP PARALLEL & ! { dg-error "Unclassifiable OpenMP" } +!$ NUM_THREADS(2) ! { dg-error "Unclassifiable" } +!$OMP END PARALLEL ! { dg-error "Unexpected" } + +!$OMP PARALLEL & ! { dg-error "Unclassifiable OpenMP" } +!$ & NUM_THREADS(2) ! { dg-error "Unclassifiable" } +!$OMP END PARALLEL ! { dg-error "Unexpected" } + +!$OMP PARALLEL & ! { dg-error "Unclassifiable OpenMP" } +! +!$ NUM_THREADS(2) ! { dg-error "Unclassifiable" } +!$OMP END PARALLEL ! { dg-error "Unexpected" } + +!$OMP PARALLEL & ! { dg-error "Unclassifiable OpenMP" } +! +!$ & NUM_THREADS(2) ! { dg-error "Unclassifiable" } +!$OMP END PARALLEL ! { dg-error "Unexpected" } + +END PROGRAM