@@ -5099,6 +5099,12 @@ void
finish_static_assert (tree condition, tree message, location_t location,
bool member_p)
{
+ if (message == NULL_TREE
+ || message == error_mark_node
+ || condition == NULL_TREE
+ || condition == error_mark_node)
+ return;
+
if (check_for_bare_parameter_packs (condition))
condition = error_mark_node;
new file mode 100644
@@ -0,0 +1,7 @@
+// { dg-do compile { target c++11 } }
+
+static_assert (1 == 0); // { dg-error "expected (string-literal|',') before" }
+
+static_assert (1 == 0,); // { dg-error "expected string-literal before '\\)'" }
+
+static_assert (1 == 0, "oops"); // { dg-error "static assertion failed" }
Ok. -------- Original Message -------- From: Dodji Seketeli <dodji@redhat.com> Sent: Mon, Aug 6, 2012 10:49 AM To: Jason Merrill <jason@redhat.com> CC: GCC Patches <gcc-patches@gcc.gnu.org> Subject: [PATCH - C++] Avoid crashing on erroneous static_assert usage When working on something else, I noticed that failing to provide the second argument to the static_assert operator would lead to an ICE. Fixed thus, and tested against trunk on x86_64-unknown-linux-gnu. gcc/cp/ * semantics.c (finish_static_assert): Don't crash on erroneous message or condition. gcc/testsuite/ * g++.dg/cpp0x/static_assert8.C: New test. --- gcc/cp/semantics.c | 6 ++++++ gcc/testsuite/g++.dg/cpp0x/static_assert8.C | 7 +++++++ 2 files changed, 13 insertions(+), 0 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/static_assert8.C