From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 22 Mar 2017 18:53:47 +0000 (+0100)
Subject: re PR c++/80141 (ICE with pragma omp declare)
X-Git-Tag: basepoints/gcc-8~375
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f13e9cd5139762a79b41c7a355e58e36352752f6;p=thirdparty%2Fgcc.git

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
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3db9895d5a8c..4493515ced8d 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 bcfdd668c3a3..ad5299a06eef 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 add3a14eca52..d8ae1ff3fa77 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 000000000000..53e497ab3499
--- /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);