From 1c90c6f9c03360da9f6b01ef0ec28e309a0bb892 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 9 Jun 2006 23:13:25 +0200 Subject: re PR preprocessor/27746 (ICE on openmp code when using _Pragma from macro) PR preprocessor/27746 * directives.c (do_pragma): Handle pragma with valid namespace and invalid name coming from macro expansion. * directives.c (destringize_and_run): Initialize next field in context. PR c/27747 PR c++/27748 * directives.c (destringize_and_run): Set NO_EXPAND on the tokens. * macro.c (_cpp_backup_tokens): Fix comment typo. testsuite/ PR c/27747 * gcc.dg/cpp/_Pragma6.c: New test. PR c++/27748 * g++.dg/cpp/_Pragma1.C: New test. PR preprocessor/27746 * gcc.dg/gomp/macro-3.c: New test. * gcc.dg/gomp/macro-4.c: New test. * g++.dg/gomp/macro-3.C: New test. * g++.dg/gomp/macro-4.C: New test. From-SVN: r114519 --- gcc/testsuite/ChangeLog | 14 ++++++++++++++ gcc/testsuite/g++.dg/cpp/_Pragma1.C | 10 ++++++++++ gcc/testsuite/g++.dg/gomp/macro-3.C | 25 +++++++++++++++++++++++++ gcc/testsuite/g++.dg/gomp/macro-4.C | 29 +++++++++++++++++++++++++++++ gcc/testsuite/gcc.dg/cpp/_Pragma6.c | 10 ++++++++++ gcc/testsuite/gcc.dg/gomp/macro-3.c | 25 +++++++++++++++++++++++++ gcc/testsuite/gcc.dg/gomp/macro-4.c | 29 +++++++++++++++++++++++++++++ 7 files changed, 142 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp/_Pragma1.C create mode 100644 gcc/testsuite/g++.dg/gomp/macro-3.C create mode 100644 gcc/testsuite/g++.dg/gomp/macro-4.C create mode 100644 gcc/testsuite/gcc.dg/cpp/_Pragma6.c create mode 100644 gcc/testsuite/gcc.dg/gomp/macro-3.c create mode 100644 gcc/testsuite/gcc.dg/gomp/macro-4.c (limited to 'gcc') diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f187c31..e3bd0e4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,17 @@ +2006-06-09 Jakub Jelinek + + PR c/27747 + * gcc.dg/cpp/_Pragma6.c: New test. + + PR c++/27748 + * g++.dg/cpp/_Pragma1.C: New test. + + PR preprocessor/27746 + * gcc.dg/gomp/macro-3.c: New test. + * gcc.dg/gomp/macro-4.c: New test. + * g++.dg/gomp/macro-3.C: New test. + * g++.dg/gomp/macro-4.C: New test. + 2006-06-09 Richard Guenther PR tree-optimization/26998 diff --git a/gcc/testsuite/g++.dg/cpp/_Pragma1.C b/gcc/testsuite/g++.dg/cpp/_Pragma1.C new file mode 100644 index 0000000..25a79f8 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp/_Pragma1.C @@ -0,0 +1,10 @@ +// PR c++/27748 +// This is supposed to succeed only if +// the target doesn't define HANDLE_PRAGMA_PACK_WITH_EXPANSION. +// { dg-do compile { target { ! *-*-solaris2* } } } + +#define push bar +#define foo _Pragma ("pack(push)") +foo +int i; +#pragma pack(pop) diff --git a/gcc/testsuite/g++.dg/gomp/macro-3.C b/gcc/testsuite/g++.dg/gomp/macro-3.C new file mode 100644 index 0000000..32623fd --- /dev/null +++ b/gcc/testsuite/g++.dg/gomp/macro-3.C @@ -0,0 +1,25 @@ +// PR preprocessor/27746 +// { dg-do compile } +// { dg-options "-fopenmp -fdump-tree-omplower" } + +#define omp FOO +#define p parallel +#define omp_parallel _Pragma ("omp parallel") +#define omp_p _Pragma ("omp p") + +void bar (void); + +void +foo (void) +{ + #pragma omp parallel + bar (); + #pragma omp p + bar (); + omp_parallel + bar (); + omp_p + bar (); +} + +// { dg-final { scan-tree-dump-times "#pragma omp parallel" 4 "omplower" } } diff --git a/gcc/testsuite/g++.dg/gomp/macro-4.C b/gcc/testsuite/g++.dg/gomp/macro-4.C new file mode 100644 index 0000000..9fc45b1 --- /dev/null +++ b/gcc/testsuite/g++.dg/gomp/macro-4.C @@ -0,0 +1,29 @@ +// PR preprocessor/27746 +// { dg-do compile } +// { dg-options "-fopenmp -Wunknown-pragmas" } + +#define p _Pragma ("omp parallel") +#define omp_p _Pragma ("omp p") + +void bar (void); + +void +foo (void) +{ +#pragma omp p // { dg-warning "ignoring #pragma omp _Pragma" } + bar (); + omp_p // { dg-warning "ignoring #pragma omp _Pragma" } + bar (); +} + +#define parallel serial +#define omp_parallel _Pragma ("omp parallel") + +void +baz (void) +{ +#pragma omp parallel // { dg-warning "ignoring #pragma omp serial" } + bar (); + omp_parallel // { dg-warning "ignoring #pragma omp serial" } + bar (); +} diff --git a/gcc/testsuite/gcc.dg/cpp/_Pragma6.c b/gcc/testsuite/gcc.dg/cpp/_Pragma6.c new file mode 100644 index 0000000..369b334 --- /dev/null +++ b/gcc/testsuite/gcc.dg/cpp/_Pragma6.c @@ -0,0 +1,10 @@ +/* PR c/27747 */ +/* This is supposed to succeed only if + the target doesn't define HANDLE_PRAGMA_PACK_WITH_EXPANSION. */ +/* { dg-do compile { target { ! *-*-solaris2* } } } */ + +#define push bar +#define foo _Pragma ("pack(push)") +foo +int i; +#pragma pack(pop) diff --git a/gcc/testsuite/gcc.dg/gomp/macro-3.c b/gcc/testsuite/gcc.dg/gomp/macro-3.c new file mode 100644 index 0000000..dc4fe09 --- /dev/null +++ b/gcc/testsuite/gcc.dg/gomp/macro-3.c @@ -0,0 +1,25 @@ +/* PR preprocessor/27746 */ +/* { dg-do compile } */ +/* { dg-options "-fopenmp -fdump-tree-omplower" } */ + +#define omp FOO +#define p parallel +#define omp_parallel _Pragma ("omp parallel") +#define omp_p _Pragma ("omp p") + +void bar (void); + +void +foo (void) +{ + #pragma omp parallel + bar (); + #pragma omp p + bar (); + omp_parallel + bar (); + omp_p + bar (); +} + +/* { dg-final { scan-tree-dump-times "#pragma omp parallel" 4 "omplower" } } */ diff --git a/gcc/testsuite/gcc.dg/gomp/macro-4.c b/gcc/testsuite/gcc.dg/gomp/macro-4.c new file mode 100644 index 0000000..7d20f4c --- /dev/null +++ b/gcc/testsuite/gcc.dg/gomp/macro-4.c @@ -0,0 +1,29 @@ +/* PR preprocessor/27746 */ +/* { dg-do compile } */ +/* { dg-options "-fopenmp -Wunknown-pragmas" } */ + +#define p _Pragma ("omp parallel") +#define omp_p _Pragma ("omp p") + +void bar (void); + +void +foo (void) +{ +#pragma omp p /* { dg-warning "ignoring #pragma omp _Pragma" } */ + bar (); + omp_p /* { dg-warning "ignoring #pragma omp _Pragma" } */ + bar (); +} + +#define parallel serial +#define omp_parallel _Pragma ("omp parallel") + +void +baz (void) +{ +#pragma omp parallel /* { dg-warning "ignoring #pragma omp serial" } */ + bar (); + omp_parallel /* { dg-warning "ignoring #pragma omp serial" } */ + bar (); +} -- cgit v1.1