* C++ PATCH for c++/46382 (not allowing static_assert in constexpr template ctor)
@ 2010-11-09 3:57 Jason Merrill
0 siblings, 0 replies; only message in thread
From: Jason Merrill @ 2010-11-09 3:57 UTC (permalink / raw)
To: gcc-patches List
[-- Attachment #1: Type: text/plain, Size: 162 bytes --]
We allow typedefs and static_asserts in constexpr functions, but were
failing to do so in a template constructor.
Tested x86_64-pc-linux-gnu, applied to trunk.
[-- Attachment #2: 46382.patch --]
[-- Type: text/plain, Size: 3469 bytes --]
commit 707cb9659373766b84378409287a8c7e71ff38d4
Author: Jason Merrill <jason@redhat.com>
Date: Mon Nov 8 18:46:30 2010 -0600
PR c++/46382
* semantics.c (check_constexpr_ctor_body): New fn.
* parser.c (cp_parser_ctor_initializer_opt_and_function_body): Call it.
* cp-tree.h: Declare it.
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 241805c..67f4f93 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -5249,6 +5249,7 @@ extern void finish_cleanup (tree, tree);
extern bool literal_type_p (tree);
extern tree validate_constexpr_fundecl (tree);
extern tree register_constexpr_fundef (tree, tree);
+extern bool check_constexpr_ctor_body (tree, tree);
extern tree ensure_literal_type_for_constexpr_object (tree);
extern bool potential_constant_expression (tree, tsubst_flags_t);
extern tree cxx_constant_value (tree);
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 6a9e4d7..4897941 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -16347,14 +16347,8 @@ cp_parser_ctor_initializer_opt_and_function_body (cp_parser *parser)
}
/* Parse the function-body. */
cp_parser_function_body (parser);
- if (check_body_p
- && (TREE_CODE (list) != STATEMENT_LIST
- || (last == NULL && STATEMENT_LIST_TAIL (list) != NULL)
- || (last != NULL && last != STATEMENT_LIST_TAIL (list)->stmt)))
- {
- error ("constexpr constructor does not have empty body");
- DECL_DECLARED_CONSTEXPR_P (current_function_decl) = false;
- }
+ if (check_body_p)
+ check_constexpr_ctor_body (last, list);
/* Finish the function body. */
finish_function_body (body);
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 494247e7..b48559e 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -5522,6 +5522,48 @@ build_data_member_initialization (tree t, VEC(constructor_elt,gc) **vec)
return true;
}
+/* Make sure that there are no statements after LAST in the constructor
+ body represented by LIST. */
+
+bool
+check_constexpr_ctor_body (tree last, tree list)
+{
+ bool ok = true;
+ if (TREE_CODE (list) == STATEMENT_LIST)
+ {
+ tree_stmt_iterator i = tsi_last (list);
+ for (; !tsi_end_p (i); tsi_prev (&i))
+ {
+ tree t = tsi_stmt (i);
+ if (t == last)
+ break;
+ if (TREE_CODE (t) == BIND_EXPR)
+ {
+ if (!check_constexpr_ctor_body (last, BIND_EXPR_BODY (t)))
+ return false;
+ else
+ continue;
+ }
+ /* We currently allow typedefs and static_assert.
+ FIXME allow them in the standard, too. */
+ if (TREE_CODE (t) != STATIC_ASSERT)
+ {
+ ok = false;
+ break;
+ }
+ }
+ }
+ else if (list != last
+ && TREE_CODE (list) != STATIC_ASSERT)
+ ok = false;
+ if (!ok)
+ {
+ error ("constexpr constructor does not have empty body");
+ DECL_DECLARED_CONSTEXPR_P (current_function_decl) = false;
+ }
+ return ok;
+}
+
/* Build compile-time evalable representations of member-initializer list
for a constexpr constructor. */
diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-sassert.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-sassert.C
new file mode 100644
index 0000000..3e08fb0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-sassert.C
@@ -0,0 +1,13 @@
+// Allow static_assert in constexpr constructors, too.
+// { dg-options -std=c++0x }
+
+template<typename T>
+struct A
+{
+ int i;
+
+ constexpr A(int i) : i(i)
+ {
+ static_assert(sizeof(T) == 1, "");
+ }
+};
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-11-09 3:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-11-09 3:57 C++ PATCH for c++/46382 (not allowing static_assert in constexpr template ctor) Jason Merrill
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).