From d25a101fe78834db307bb868056b0ff5152e0eb3 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Thu, 14 Apr 2016 16:14:44 -0400
Subject: [PATCH] re PR c++/70543 (wrong non-const error for enable_if and
 constexpr function)

	PR c++/70543

	* pt.c (value_dependent_expression_p) [VAR_DECL]: A type-dependent
	initializer also makes the variable value-dependent.

From-SVN: r234990
---
 gcc/cp/ChangeLog                                |  4 ++++
 gcc/cp/pt.c                                     |  1 +
 .../g++.dg/cpp0x/constexpr-template9.C          | 17 +++++++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/constexpr-template9.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index cba07aa166a..01f13b73cd2 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2016-04-14  Jason Merrill  <jason@redhat.com>
 
+	PR c++/70543
+	* pt.c (value_dependent_expression_p) [VAR_DECL]: A type-dependent
+	initializer also makes the variable value-dependent.
+
 	PR c++/70648
 	* constexpr.c (cxx_eval_store_expression): Also copy
 	CONSTRUCTOR_NO_IMPLICIT_ZERO.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index d066e559d0c..4a00530b312 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -22670,6 +22670,7 @@ value_dependent_expression_p (tree expression)
 	  && (TREE_CODE (DECL_INITIAL (expression)) == TREE_LIST
 	      /* cp_finish_decl doesn't fold reference initializers.  */
 	      || TREE_CODE (TREE_TYPE (expression)) == REFERENCE_TYPE
+	      || type_dependent_expression_p (DECL_INITIAL (expression))
 	      || value_dependent_expression_p (DECL_INITIAL (expression))))
 	return true;
       return false;
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-template9.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-template9.C
new file mode 100644
index 00000000000..2ca641d77e3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-template9.C
@@ -0,0 +1,17 @@
+// PR c++/70543
+// { dg-do compile { target c++11 } }
+
+template <typename>
+struct X
+{
+  template <unsigned int = 0>
+  static constexpr int
+  calc (void)
+  {
+    return 0;
+  }
+
+  static constexpr unsigned int value = calc ();
+
+  char foo[value];
+};
-- 
2.30.2