Tested on x86_64-pc-linux-gnu.
First time using git send-email, let me know if anything needs to be
done differently.
OK for trunk?
Thanks,
Nina
----
Contract assert is an attribute on a non empty statement. Currently we
assert that the statement is empty before emitting the assertion. This
has been changed to a conditional check that the statement is empty
before the assertion is emitted.
PR c++/117579
gcc/cp/ChangeLog:
* parser.cc (cp_parser_statement): assertion replaced with a
conditional check that the statement containing a contract
assert is empty.
gcc/testsuite/ChangeLog:
* g++.dg/contracts/pr117579.C: New test.
Signed-off-by: Nina Ranns <[email protected]>
---
gcc/cp/parser.cc | 6 ++++--
gcc/testsuite/g++.dg/contracts/pr117579.C | 9 +++++++++
2 files changed, 13 insertions(+), 2 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/contracts/pr117579.C
diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc
index f60ed47dfd7..e655e5cc0db 100644
--- a/gcc/cp/parser.cc
+++ b/gcc/cp/parser.cc
@@ -13082,8 +13082,10 @@ cp_parser_statement (cp_parser* parser, tree
in_statement_expr,
if (cp_contract_assertion_p (std_attrs))
{
/* Add the assertion as a statement in the current block. */
- gcc_assert (!statement || statement == error_mark_node);
- emit_assertion (std_attrs);
+ if (!statement)
+ emit_assertion (std_attrs);
+ /* we already checked that the contract assertion is followed by
+ a semicolon. */
std_attrs = NULL_TREE;
}
}
diff --git a/gcc/testsuite/g++.dg/contracts/pr117579.C
b/gcc/testsuite/g++.dg/contracts/pr117579.C
new file mode 100644
index 00000000000..f15cdf0c78d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/contracts/pr117579.C
@@ -0,0 +1,9 @@
+// check that contract assertion on a non empty statement doesn't cause an ICE
+// { dg-do compile }
+// { dg-options "-std=c++2a -fcontracts " }
+
+void f();
+int main ()
+{
+ [[assert: true]] f(); // { dg-error "assertions must be followed by" }
+}
--
2.45.2
