This patch fixes parsing of transaction expressions, so that two txn
expressions that are part of a single expression do not get treated as
nested txns anymore, but become two separate ones (see test case).
This was approved off-line by Richard Henderson for the trans-mem branch
and posted before Nov 7, but didn't made it into the actual merge of
this branch.
OK for trunk?
commit 7d9d9f46972b12b92fb7f0ce227918140c6d1397
Author: Torvald Riegel <trie...@redhat.com>
Date: Mon Nov 14 22:16:12 2011 +0100
Require parentheses when parsing transaction expressions.
gcc/
* c-parser.c (c_parser_transaction_expression): Require parentheses
when parsing transaction expressions.
gcc/cp/
* parser.c (cp_parser_transaction_expression): Require parentheses
when parsing transaction expressions.
gcc/testsuite/
* c-c++-common/tm/trxn-expr-3.c: New test.
diff --git a/gcc/c-parser.c b/gcc/c-parser.c
index aed390f..b88b11f 100644
--- a/gcc/c-parser.c
+++ b/gcc/c-parser.c
@@ -10699,7 +10699,7 @@ c_parser_transaction_expression (c_parser *parser, enum
rid keyword)
}
parser->in_transaction = this_in;
- if (c_parser_next_token_is (parser, CPP_OPEN_PAREN))
+ if (c_parser_require (parser, CPP_OPEN_PAREN, "expected %<(%>"))
{
tree expr = c_parser_expression (parser).value;
ret.original_type = TREE_TYPE (expr);
@@ -10708,10 +10708,15 @@ c_parser_transaction_expression (c_parser *parser,
enum rid keyword)
TRANSACTION_EXPR_RELAXED (ret.value) = 1;
SET_EXPR_LOCATION (ret.value, loc);
ret.original_code = TRANSACTION_EXPR;
+ if (!c_parser_require (parser, CPP_CLOSE_PAREN, "expected %<)%>"))
+ {
+ c_parser_skip_until_found (parser, CPP_CLOSE_PAREN, NULL);
+ goto error;
+ }
}
else
{
- c_parser_error (parser, "expected %<(%>");
+ error:
ret.value = error_mark_node;
ret.original_code = ERROR_MARK;
ret.original_type = NULL;
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 23885b8..f839112 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -26811,7 +26811,7 @@ cp_parser_transaction_expression (cp_parser *parser,
enum rid keyword)
unsigned char old_in = parser->in_transaction;
unsigned char this_in = 1;
cp_token *token;
- tree ret;
+ tree expr;
gcc_assert (keyword == RID_TRANSACTION_ATOMIC
|| keyword == RID_TRANSACTION_RELAXED);
@@ -26832,22 +26832,19 @@ cp_parser_transaction_expression (cp_parser *parser,
enum rid keyword)
this_in |= TM_STMT_ATTR_RELAXED;
parser->in_transaction = this_in;
- if (cp_lexer_next_token_is (parser->lexer, CPP_OPEN_PAREN))
- {
- tree expr = cp_parser_expression (parser, /*cast_p=*/false, NULL);
- ret = build_transaction_expr (token->location, expr, this_in);
- }
- else
- {
- cp_parser_error (parser, "expected %<(%>");
- ret = error_mark_node;
- }
+ cp_parser_require (parser, CPP_OPEN_PAREN, RT_OPEN_PAREN);
+
+ expr = cp_parser_expression (parser, /*cast_p=*/false, NULL);
+ finish_parenthesized_expr (expr);
+ expr = build_transaction_expr (token->location, expr, this_in);
+
+ cp_parser_require (parser, CPP_CLOSE_PAREN, RT_CLOSE_PAREN);
parser->in_transaction = old_in;
if (cp_parser_non_integral_constant_expression (parser, NIC_TRANSACTION))
return error_mark_node;
- return (flag_tm ? ret : error_mark_node);
+ return (flag_tm ? expr : error_mark_node);
}
/* Parse a function-transaction-block.
diff --git a/gcc/testsuite/c-c++-common/tm/trxn-expr-3.c
b/gcc/testsuite/c-c++-common/tm/trxn-expr-3.c
new file mode 100644
index 0000000..0a87780
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/tm/trxn-expr-3.c
@@ -0,0 +1,14 @@
+// { dg-do compile }
+// { dg-options "-fgnu-tm -O -fdump-tree-tmmark" }
+
+int global;
+
+int f2()
+{
+ return __transaction_atomic (global + 3)
+ + __transaction_atomic (global + 4);
+}
+
+/* { dg-final { scan-tree-dump-times "ITM_RU" 2 "tmmark" } } */
+/* { dg-final { scan-tree-dump-times "ITM_commitTransaction" 2 "tmmark" } } */
+/* { dg-final { cleanup-tree-dump "tmmark" } } */
