diff options
Diffstat (limited to 'gcc/cp/parser.c')
| -rw-r--r-- | gcc/cp/parser.c | 21 |
1 files changed, 9 insertions, 12 deletions
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. |