diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2019-07-08 22:08:27 +0000 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2020-03-03 12:49:47 +0100 |
| commit | c68bbcbc64200458e9992cfc64edb31c834ecf70 (patch) | |
| tree | 8befcec23efe2db882c921cf01a56b443d1bc869 | |
| parent | 17d0289f0b0fba90c358e0e2894ee166bffe1026 (diff) | |
| download | gcc-c68bbcbc64200458e9992cfc64edb31c834ecf70.zip gcc-c68bbcbc64200458e9992cfc64edb31c834ecf70.tar.gz gcc-c68bbcbc64200458e9992cfc64edb31c834ecf70.tar.bz2 | |
Fix ICE in cp_omp_mappable_type_1
2019-07-09 Andrew Stubbs <ams@codesourcery.com>
Backport from mainline
2019-07-08 Jakub Jelinek <jakub@redhat.com>
PR c++/91110
* decl2.c (cp_omp_mappable_type_1): Don't emit any note for
error_mark_node type.
* g++.dg/gomp/pr91110.C: New test.
(cherry picked from openacc-gcc-9-branch commit
d6b6e2be68c197f41e19350df017685e652893ff)
| -rw-r--r-- | gcc/cp/ChangeLog.omp | 9 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog.omp | 8 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/gomp/pr91110.C | 11 |
4 files changed, 29 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog.omp b/gcc/cp/ChangeLog.omp index 11ed1e7..8306bd0 100644 --- a/gcc/cp/ChangeLog.omp +++ b/gcc/cp/ChangeLog.omp @@ -1,3 +1,12 @@ +2019-07-09 Andrew Stubbs <ams@codesourcery.com> + + Backport from mainline: + 2019-07-08 Jakub Jelinek <jakub@redhat.com> + + PR c++/91110 + * decl2.c (cp_omp_mappable_type_1): Don't emit any note for + error_mark_node type. + 2019-07-04 Andrew Stubbs <ams@codesourcery.com> Backport from mainline: diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index b10f730..37a95b9 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -1416,7 +1416,7 @@ cp_omp_mappable_type_1 (tree type, bool notes) /* Mappable type has to be complete. */ if (type == error_mark_node || !COMPLETE_TYPE_P (type)) { - if (notes) + if (notes && type != error_mark_node) { tree decl = TYPE_MAIN_DECL (type); inform ((decl ? DECL_SOURCE_LOCATION (decl) : input_location), diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp index fc20b35..deddcc5 100644 --- a/gcc/testsuite/ChangeLog.omp +++ b/gcc/testsuite/ChangeLog.omp @@ -1,3 +1,11 @@ +2019-07-09 Andrew Stubbs <ams@codesourcery.com> + + Backport from mainline: + 2019-07-08 Jakub Jelinek <jakub@redhat.com> + + PR c++/91110 + * g++.dg/gomp/pr91110.C: New test. + 2019-07-04 Andrew Stubbs <ams@codesourcery.com> Backport from mainline: diff --git a/gcc/testsuite/g++.dg/gomp/pr91110.C b/gcc/testsuite/g++.dg/gomp/pr91110.C new file mode 100644 index 0000000..332c99a --- /dev/null +++ b/gcc/testsuite/g++.dg/gomp/pr91110.C @@ -0,0 +1,11 @@ +// PR c++/91110 +// { dg-do compile } + +void +foo () +{ + X b[2]; // { dg-error "'X' was not declared in this scope" } + b[0] = 1; // { dg-error "'b' was not declared in this scope" } + #pragma omp target map(to: b) // { dg-error "'b' does not have a mappable type in 'map' clause" } + ; +} |