Patchwork PR c++/51633 - ICEs with constexpr constructor

login
register
mail settings
Submitter Dodji Seketeli
Date Jan. 11, 2012, 11:25 p.m.
Message ID <m3ipkhzury.fsf@redhat.com>
Download mbox | patch
Permalink /patch/135532/
State New
Headers show

Comments

Dodji Seketeli - Jan. 11, 2012, 11:25 p.m.
Paolo Carlini <pcarlini@gmail.com> writes:

> ... watch out trailing blank lines ;)

Hopefully fixed below.  Thanks for watching.

gcc/cp/

	* semantics.c (cp_parser_ctor_initializer_opt_and_function_body):
	Set the pointer to the last block of the constructor to the
	current statement.
	(build_constexpr_constructor_member_initializers): Get
	build_data_member_initialization a chance to deal with more
	statements before we choke.

gcc/testsuite/

	* g++.dg/cpp0x/constexpr-diag4.C: New test.
---
 gcc/cp/parser.c                              |    2 +-
 gcc/cp/semantics.c                           |    2 +
 gcc/testsuite/g++.dg/cpp0x/constexpr-diag4.C |   25 +++++++++++++
 gcc/testsuite/g++.dg/cpp0x/constexpr-diag5.C |   48 ++++++++++++++++++++++++++
 4 files changed, 76 insertions(+), 1 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/constexpr-diag4.C
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/constexpr-diag5.C

Patch

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 0ae55a2..ea9ccfc 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -17418,7 +17418,7 @@  cp_parser_ctor_initializer_opt_and_function_body (cp_parser *parser)
      cp_parser_function_body changed its state.  */
   if (check_body_p)
     {
-      list = body;
+      list = cur_stmt_list;
       if (TREE_CODE (list) == BIND_EXPR)
 	list = BIND_EXPR_BODY (list);
       if (TREE_CODE (list) == STATEMENT_LIST
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index fbb74e1..9369179 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -5930,6 +5930,8 @@  build_constexpr_constructor_member_initializers (tree type, tree body)
 	    break;
 	}
     }
+  else if (EXPR_P (body))
+    ok = build_data_member_initialization (body, &vec);
   else
     gcc_assert (errorcount > 0);
   if (ok)
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-diag4.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-diag4.C
new file mode 100644
index 0000000..371190e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-diag4.C
@@ -0,0 +1,25 @@ 
+// Origin: PR c++/51633
+// { dg-options "-std=c++11" }
+
+struct A
+{
+    ~A();
+};
+
+struct B
+{
+    A a;
+    constexpr B() {}
+};
+
+struct A1
+{
+    int a;
+    ~A1();
+};
+
+struct B1
+{
+    A1 a1;
+    constexpr B1() {} // { dg-error "uninitialized member" }
+};
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-diag5.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-diag5.C
new file mode 100644
index 0000000..c0cbfdd
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-diag5.C
@@ -0,0 +1,48 @@ 
+// Origin: PR c++/51633
+// { dg-options "-std=c++11" }
+
+struct A
+{
+    constexpr A() {}
+    ~A();
+};
+
+struct B
+{
+    A a;
+    A b;
+    A c;
+    constexpr B() {}
+};
+
+struct C
+{
+    A a;
+    constexpr C() {}
+};
+
+struct D
+{
+    constexpr D() { return;} // { dg-error "does not have empty body" }
+};
+
+struct D1
+{
+    A a;
+    constexpr D1() { return;} // { dg-error "does not have empty body" }
+};
+
+struct D2
+{
+    A a;
+    A b;
+    constexpr D2() { return;} // { dg-error "does not have empty body" }
+};
+
+struct D3
+{
+    A a;
+    A b;
+    A c;
+    constexpr D3() { return;} // { dg-error "does not have empty body" }
+};