backport: re PR c++/80141 (ICE with pragma omp declare)

	Backported from mainline
	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.

	* g++.dg/gomp/pr80141.C: New test.

From-SVN: r248663

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4f07104c040df6bfddec4b7827503c2d6483d8d6..d867b9c5f9faef199a6164a4a79b42a877163f86 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,6 +1,13 @@
 2017-05-30  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       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-10  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/79896

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 6705d1f97c9a4f353f8bf564ae6adec8aa7ff6f9..a4fd77ec66167cc8c242e40c19a1459e21fc7bb9 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -5546,9 +5546,9 @@ finish_omp_clauses (tree clauses)
          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)
                    {
@@ -5726,9 +5726,9 @@ finish_omp_clauses (tree clauses)
          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 895f61037d20d831633dfa989b4babe44620568b..d1080804767ccca68f97ce2ae98eeae98ff0f271 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -3,6 +3,9 @@
        Backported from mainline
        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 (file)
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);