re PR c++/58607 ([c++11] ICE with undeclared variable in constexpr)

/cp
2013-11-25  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/58607
	* semantics.c (check_constexpr_ctor_body): Check for BIND_EXPR_VARS.

/testsuite
2013-11-25  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/58607
	* g++.dg/cpp0x/constexpr-ice9.C: New.

From-SVN: r205364

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8118471..e567aa0 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
 2013-11-25  Paolo Carlini  <paolo.carlini@oracle.com>
 
+       PR c++/58607
+       * semantics.c (check_constexpr_ctor_body): Check for BIND_EXPR_VARS.
+
+2013-11-25  Paolo Carlini  <paolo.carlini@oracle.com>
+
        PR c++/58810
        * decl.c (grokdeclarator): Don't handle qualified free functions here,
        leave the diagnostic to grokfndecl.

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 316834c..d871c4d 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -7596,6 +7596,11 @@ check_constexpr_ctor_body (tree last, tree list)
            break;
          if (TREE_CODE (t) == BIND_EXPR)
            {
+             if (BIND_EXPR_VARS (t))
+               {
+                 ok = false;
+                 break;
+               }
              if (!check_constexpr_ctor_body (last, BIND_EXPR_BODY (t)))
                return false;
              else

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 50e72f4..920f826 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2013-11-25  Paolo Carlini  <paolo.carlini@oracle.com>
 
+       PR c++/58607
+       * g++.dg/cpp0x/constexpr-ice9.C: New.
+
+2013-11-25  Paolo Carlini  <paolo.carlini@oracle.com>
+
        PR c++/58810
        * g++.dg/other/cv_func3.C: New.
        * g++.dg/other/cv_func.C: Adjust.

diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ice9.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ice9.C
new file mode 100644 (file)
index 0000000..50de372
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ice9.C
@@ -0,0 +1,7 @@
+// PR c++/58607
+// { dg-do compile { target c++11 } }
+
+struct A
+{
+  constexpr A() { i; }  // { dg-error "declared|empty body" }
+};