From 114d8843e607fd4856c2a35741a80cddb965f278 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 4 Dec 2012 00:28:30 +0000 Subject: compiler: Don't permit go/defer argument to be parenthesized. Fixes Go repository issue 4468. From-SVN: r194112 --- gcc/go/gofrontend/parse.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gcc/go') diff --git a/gcc/go/gofrontend/parse.cc b/gcc/go/gofrontend/parse.cc index fe463c7..c13f06b 100644 --- a/gcc/go/gofrontend/parse.cc +++ b/gcc/go/gofrontend/parse.cc @@ -4089,13 +4089,16 @@ Parse::go_or_defer_stat() || this->peek_token()->is_keyword(KEYWORD_DEFER)); bool is_go = this->peek_token()->is_keyword(KEYWORD_GO); Location stat_location = this->location(); - this->advance_token(); + + const Token* token = this->advance_token(); Location expr_location = this->location(); + bool is_parenthesized = token->is_op(OPERATOR_LPAREN); + Expression* expr = this->expression(PRECEDENCE_NORMAL, false, true, NULL); Call_expression* call_expr = expr->call_expression(); - if (call_expr == NULL) + if (is_parenthesized || call_expr == NULL) { - error_at(expr_location, "expected call expression"); + error_at(expr_location, "argument to go/defer must be function call"); return; } -- cgit v1.1