aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2017-03-22 19:53:47 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2017-03-22 19:53:47 +0100
commitf13e9cd5139762a79b41c7a355e58e36352752f6 (patch)
treea471ecb06b4bad2f5c02925af84159d909cc3546 /gcc
parentfd6cba40e198d145bc53502e258db560936f2226 (diff)
downloadgcc-f13e9cd5139762a79b41c7a355e58e36352752f6.zip
gcc-f13e9cd5139762a79b41c7a355e58e36352752f6.tar.gz
gcc-f13e9cd5139762a79b41c7a355e58e36352752f6.tar.bz2
re PR c++/80141 (ICE with pragma omp declare)
PR c++/80141 * semantics.c (finish_omp_clause) <case OMP_CLAUSE_SIMDLEN, case OMP_CLAUSE_ALIGNED>: Call maybe_constant_value only when not processing_template_decl. * g++.dg/gomp/pr80141.C: New test. From-SVN: r246403
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog7
-rw-r--r--gcc/cp/semantics.c4
-rw-r--r--gcc/testsuite/ChangeLog3
-rw-r--r--gcc/testsuite/g++.dg/gomp/pr80141.C8
4 files changed, 20 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3db9895..4493515 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2017-03-22 Jakub Jelinek <jakub@redhat.com>
+
+ PR c++/80141
+ * semantics.c (finish_omp_clause) <case OMP_CLAUSE_SIMDLEN,
+ case OMP_CLAUSE_ALIGNED>: Call maybe_constant_value only when not
+ processing_template_decl.
+
2017-03-21 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/77752
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index bcfdd66..ad5299a 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -6416,9 +6416,9 @@ finish_omp_clauses (tree clauses, enum c_omp_region_type ort)
else
{
t = mark_rvalue_use (t);
- t = maybe_constant_value (t);
if (!processing_template_decl)
{
+ t = maybe_constant_value (t);
if (TREE_CODE (t) != INTEGER_CST
|| tree_int_cst_sgn (t) != 1)
{
@@ -6586,9 +6586,9 @@ finish_omp_clauses (tree clauses, enum c_omp_region_type ort)
else
{
t = mark_rvalue_use (t);
- t = maybe_constant_value (t);
if (!processing_template_decl)
{
+ t = maybe_constant_value (t);
if (TREE_CODE (t) != INTEGER_CST
|| tree_int_cst_sgn (t) != 1)
{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index add3a14..d8ae1ff 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
2017-03-22 Jakub Jelinek <jakub@redhat.com>
+ PR c++/80141
+ * g++.dg/gomp/pr80141.C: New test.
+
PR c++/80129
* g++.dg/torture/pr80129.C: New test.
diff --git a/gcc/testsuite/g++.dg/gomp/pr80141.C b/gcc/testsuite/g++.dg/gomp/pr80141.C
new file mode 100644
index 0000000..53e497a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/gomp/pr80141.C
@@ -0,0 +1,8 @@
+// PR c++/80141
+// { dg-do compile }
+
+#pragma omp declare simd aligned (p : 2 && 2)
+template<int> void foo (int *p);
+
+#pragma omp declare simd simdlen (2 && 2)
+template<int> void bar (int *p);