From: Jason Merrill <jason@redhat.com>
Date: Thu, 5 Apr 2018 16:04:08 +0000 (-0400)
Subject: PR c++/84665 - ICE with array of empty class.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=68218b64edccb3286d57217f7bd85264340e5a9f;p=gcc.git

PR c++/84665 - ICE with array of empty class.

	* decl2.c (cp_check_const_attributes): Use fold_non_dependent_expr.

From-SVN: r259132
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index cd3e36323c3..b453577fa14 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2018-04-05  Jason Merrill  <jason@redhat.com>
 
+	PR c++/84665 - ICE with array of empty class.
+	* decl2.c (cp_check_const_attributes): Use fold_non_dependent_expr.
+
 	PR c++/85228 - ICE with lambda in enumerator in template.
 	* pt.c (bt_instantiate_type_proc): Don't assume
 	CLASSTYPE_TEMPLATE_INFO is non-null.
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 6078fb668a7..b0bf8241f71 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -1416,7 +1416,7 @@ cp_check_const_attributes (tree attributes)
 	{
 	  tree expr = TREE_VALUE (arg);
 	  if (EXPR_P (expr))
-	    TREE_VALUE (arg) = maybe_constant_value (expr);
+	    TREE_VALUE (arg) = fold_non_dependent_expr (expr);
 	}
     }
 }
diff --git a/gcc/testsuite/g++.dg/ext/attr-noinline-4.C b/gcc/testsuite/g++.dg/ext/attr-noinline-4.C
new file mode 100644
index 00000000000..27c7ae80fec
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/attr-noinline-4.C
@@ -0,0 +1,10 @@
+// PR c++/84665
+
+struct S {} a[1];
+
+template <int N>
+void
+foo ()
+{
+  __attribute__ ((noinline (a[0]))) int c = 0; // { dg-error "wrong number of arguments" }
+}