From 36fbe1952b1ccdc289e6ead3ddd02eeb7c4457f7 Mon Sep 17 00:00:00 2001
From: paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 10 Nov 2011 02:27:16 +0000
Subject: [PATCH] /cp 2011-11-09  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/50837
	* pt.c (tsubst_copy_and_build) [IDENTIFIER_NODE]: In C++11 mode
	pass allow_non_integral_constant_expression_p = true to
	finish_id_expression.

/testsuite
2011-11-09  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/50837
	* g++.dg/cpp0x/static_assert5.C: New.
	* g++.dg/template/nontype13.C: Tweak.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@181248 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/cp/ChangeLog                            |  7 +++++++
 gcc/cp/pt.c                                 |  2 +-
 gcc/testsuite/ChangeLog                     |  8 +++++++-
 gcc/testsuite/g++.dg/cpp0x/static_assert5.C | 21 +++++++++++++++++++++
 gcc/testsuite/g++.dg/template/nontype13.C   |  2 +-
 5 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/static_assert5.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 406f77c7266..33bfa33403d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-09  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/50837
+	* pt.c (tsubst_copy_and_build) [IDENTIFIER_NODE]: In C++11 mode
+	pass allow_non_integral_constant_expression_p = true to
+	finish_id_expression.
+
 2011-11-09  Jason Merrill  <jason@redhat.com>
 
 	PR c++/50972
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 55eba5a0910..da5497ea5c7 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -13233,7 +13233,7 @@ tsubst_copy_and_build (tree t,
 	decl = finish_id_expression (t, decl, NULL_TREE,
 				     &idk,
 				     integral_constant_expression_p,
-				     /*allow_non_integral_constant_expression_p=*/false,
+          /*allow_non_integral_constant_expression_p=*/(cxx_dialect >= cxx0x),
 				     &non_integral_constant_expression_p,
 				     /*template_p=*/false,
 				     /*done=*/true,
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0f71e6773a3..c5004a41390 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-09  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/50837
+	* g++.dg/cpp0x/static_assert5.C: New.
+	* g++.dg/template/nontype13.C: Tweak.
+
 2011-11-09  Jason Merrill  <jason@redhat.com>
 
 	PR c++/50972
@@ -25,7 +31,7 @@
 
 2011-11-09  Patrick Marlier  <patrick.marlier@gmail.com>
 
-	* gcc.dg/tm/memopt-1.c:  Adjust regexp. 
+	* gcc.dg/tm/memopt-1.c:  Adjust regexp.
 
 2011-11-09  Jason Merrill  <jason@redhat.com>
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/static_assert5.C b/gcc/testsuite/g++.dg/cpp0x/static_assert5.C
new file mode 100644
index 00000000000..b918796220c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/static_assert5.C
@@ -0,0 +1,21 @@
+// PR c++/50837
+// { dg-options "-std=c++0x" }
+
+template<class T>
+struct z
+{
+  static constexpr bool test_constexpr()
+  {
+    return true;
+  }
+
+  static void test()
+  {
+    static_assert(test_constexpr(), "test1");
+  }
+};
+
+int main()
+{
+  z<int>::test();
+}
diff --git a/gcc/testsuite/g++.dg/template/nontype13.C b/gcc/testsuite/g++.dg/template/nontype13.C
index 4b3e862ba80..d604da94454 100644
--- a/gcc/testsuite/g++.dg/template/nontype13.C
+++ b/gcc/testsuite/g++.dg/template/nontype13.C
@@ -11,7 +11,7 @@ struct Dummy
   template<bool B>
   void tester()
   {
-    bar<evil>()(); // { dg-error "constant" }
+    bar<evil>()(); // { dg-error "constant|template" }
   }
   template<bool B>
   struct bar
-- 
2.11.0