re PR c++/51225 ([c++0x] [4.7 Regression] ICE with invalid template parameter)

/cp
2012-01-18  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/51225
	* typeck2.c (store_init_value): Within a template guard
	cxx_constant_value with require_potential_constant_expression.
	* pt.c (convert_nontype_argument): Likewise.

/testsuite
2012-01-18  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/51225
	* g++.dg/cpp0x/pr51225.C: New.

From-SVN: r183286

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e90f8331204561b94754546583302a22155da38b..b0660ce57af3287eadeb9eb8f7f46632f52b5545 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2012-01-18  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/51225
+       * typeck2.c (store_init_value): Within a template guard
+       cxx_constant_value with require_potential_constant_expression.
+       * pt.c (convert_nontype_argument): Likewise.
+
 2012-01-16  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/51854

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index f2b4c8e0319a22fa2a785e3acdf0d3bb860ba0ae..87ec5f5103efffd797eeedc7ca32a6637ab53166 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -5807,6 +5807,9 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain)
          if (complain & tf_error)
            {
              int errs = errorcount, warns = warningcount;
+             if (processing_template_decl
+                 && !require_potential_constant_expression (expr))
+               return NULL_TREE;
              expr = cxx_constant_value (expr);
              if (errorcount > errs || warningcount > warns)
                inform (EXPR_LOC_OR_HERE (expr),

diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index a1b4274bdb1a4b1cdd0f2bc086e97c6484921194..7793744ae4fa031427c8ced845f13602516f8e47 100644 (file)
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -718,8 +718,14 @@ store_init_value (tree decl, tree init, VEC(tree,gc)** cleanups, int flags)
       value = fold_non_dependent_expr (value);
       value = maybe_constant_init (value);
       if (DECL_DECLARED_CONSTEXPR_P (decl))
-       /* Diagnose a non-constant initializer for constexpr.  */
-       value = cxx_constant_value (value);
+       {
+         /* Diagnose a non-constant initializer for constexpr.  */
+         if (processing_template_decl
+             && !require_potential_constant_expression (value))
+           value = error_mark_node;
+         else
+           value = cxx_constant_value (value);
+       }
       const_init = (reduced_constant_expression_p (value)
                    || error_operand_p (value));
       DECL_INITIALIZED_BY_CONSTANT_EXPRESSION_P (decl) = const_init;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 352f15d99fd153f91f3e137dab8eedbc5cf8a109..e79f00b58acaa020cdb4d8303c6a84f6149a0207 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-18  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/51225
+       * g++.dg/cpp0x/pr51225.C: New.
+
 2012-01-17  Ian Lance Taylor  <iant@google.com>
 
        PR go/50656

diff --git a/gcc/testsuite/g++.dg/cpp0x/pr51225.C b/gcc/testsuite/g++.dg/cpp0x/pr51225.C
new file mode 100644 (file)
index 0000000..6fcf861
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/pr51225.C
@@ -0,0 +1,14 @@
+// PR c++/51225
+// { dg-options "-std=c++0x" }
+
+template<int> struct A {};
+
+template<typename> void foo()
+{
+  A<int(x)> a; // { dg-error "not declared|invalid type" }
+}
+
+template<typename> struct bar
+{
+  static constexpr A<1> b = A<1>(x); // { dg-error "not declared" }
+};