From ab0bc602236eb8ef5660693daefdf9bc1ab583a7 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Fri, 2 Aug 2013 07:59:14 +0000 Subject: [PATCH] cp-tree.h (finish_stmt): Do not declare. 2013-08-02 Paolo Carlini * cp-tree.h (finish_stmt): Do not declare. * decl.c (finish_stmt): Do not define. * parser.c (cp_parser_expression_statement, cp_parser_declaration_statement, cp_parser_transaction_cancel): Don't call finish_stmt. * semantics.c (finish_expr_stmt, finish_if_stmt, finish_while_stmt, finish_do_stmt, finish_return_stmt, finish_for_stmt, finish_switch_stmt, finish_compound_stmt, finish_transaction_stmt): Likewise. From-SVN: r201427 --- gcc/cp/ChangeLog | 12 ++++++++++++ gcc/cp/cp-tree.h | 1 - gcc/cp/decl.c | 7 ------- gcc/cp/parser.c | 6 ------ gcc/cp/semantics.c | 11 ----------- 5 files changed, 12 insertions(+), 25 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e542959947f..95cfb1beb49 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,15 @@ +2013-08-02 Paolo Carlini + + * cp-tree.h (finish_stmt): Do not declare. + * decl.c (finish_stmt): Do not define. + * parser.c (cp_parser_expression_statement, + cp_parser_declaration_statement, + cp_parser_transaction_cancel): Don't call finish_stmt. + * semantics.c (finish_expr_stmt, finish_if_stmt, + finish_while_stmt, finish_do_stmt, finish_return_stmt, + finish_for_stmt, finish_switch_stmt, finish_compound_stmt, + finish_transaction_stmt): Likewise. + 2013-08-01 Fabien Chêne PR c++/54537 diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 859f8051858..e4363903c15 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -5217,7 +5217,6 @@ extern tree grokmethod (cp_decl_specifier_seq *, const cp_declarator *, tree) extern void maybe_register_incomplete_var (tree); extern void maybe_commonize_var (tree); extern void complete_vars (tree); -extern void finish_stmt (void); extern tree static_fn_type (tree); extern void revert_static_member_fn (tree); extern void fixup_anonymous_aggr (tree); diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 7d6fe0de8c1..d49ed2903bf 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -14266,13 +14266,6 @@ cxx_maybe_build_cleanup (tree decl, tsubst_flags_t complain) } -/* When a stmt has been parsed, this function is called. */ - -void -finish_stmt (void) -{ -} - /* Return the FUNCTION_TYPE that corresponds to MEMFNTYPE, which can be a FUNCTION_DECL, METHOD_TYPE, FUNCTION_TYPE, pointer or reference to METHOD_TYPE or FUNCTION_TYPE, or pointer to member function. */ diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index e8dea336d75..c5d398a5baf 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -9419,8 +9419,6 @@ cp_parser_expression_statement (cp_parser* parser, tree in_statement_expr) statement = finish_stmt_expr_expr (statement, in_statement_expr); else if (statement) statement = finish_expr_stmt (statement); - else - finish_stmt (); return statement; } @@ -10472,9 +10470,6 @@ cp_parser_declaration_statement (cp_parser* parser) /* Free any declarators allocated. */ obstack_free (&declarator_obstack, p); - - /* Finish off the statement. */ - finish_stmt (); } /* Some dependent statements (like `if (cond) statement'), are @@ -28609,7 +28604,6 @@ cp_parser_transaction_cancel (cp_parser *parser) stmt = build_tm_abort_call (token->location, is_outer); add_stmt (stmt); - finish_stmt (); return stmt; } diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index acdd1788f6e..3bc09b9ef3f 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -641,8 +641,6 @@ finish_expr_stmt (tree expr) r = add_stmt (expr); } - finish_stmt (); - return r; } @@ -707,7 +705,6 @@ finish_if_stmt (tree if_stmt) tree scope = IF_SCOPE (if_stmt); IF_SCOPE (if_stmt) = NULL; add_stmt (do_poplevel (scope)); - finish_stmt (); } /* Begin a while-statement. Returns a newly created WHILE_STMT if @@ -740,7 +737,6 @@ void finish_while_stmt (tree while_stmt) { WHILE_BODY (while_stmt) = do_poplevel (WHILE_BODY (while_stmt)); - finish_stmt (); } /* Begin a do-statement. Returns a newly created DO_STMT if @@ -778,7 +774,6 @@ finish_do_stmt (tree cond, tree do_stmt) { cond = maybe_convert_cond (cond); DO_COND (do_stmt) = cond; - finish_stmt (); } /* Finish a return-statement. The EXPRESSION returned, if any, is as @@ -815,7 +810,6 @@ finish_return_stmt (tree expr) TREE_NO_WARNING (r) |= no_warning; r = maybe_cleanup_point_expr_void (r); r = add_stmt (r); - finish_stmt (); return r; } @@ -941,8 +935,6 @@ finish_for_stmt (tree for_stmt) *scope_ptr = NULL; add_stmt (do_poplevel (scope)); } - - finish_stmt (); } /* Begin a range-for-statement. Returns a new RANGE_FOR_STMT. @@ -1076,7 +1068,6 @@ finish_switch_stmt (tree switch_stmt) SWITCH_STMT_BODY (switch_stmt) = pop_stmt_list (SWITCH_STMT_BODY (switch_stmt)); pop_switch (); - finish_stmt (); scope = SWITCH_STMT_SCOPE (switch_stmt); SWITCH_STMT_SCOPE (switch_stmt) = NULL; @@ -1298,7 +1289,6 @@ finish_compound_stmt (tree stmt) /* ??? See c_end_compound_stmt wrt statement expressions. */ add_stmt (stmt); - finish_stmt (); } /* Finish an asm-statement, whose components are a STRING, some @@ -5208,7 +5198,6 @@ finish_transaction_stmt (tree stmt, tree compound_stmt, int flags, tree noex) if (compound_stmt) finish_compound_stmt (compound_stmt); - finish_stmt (); } /* Build a __transaction_atomic or __transaction_relaxed expression. If -- 2.30.2