From 21ba0ceaa5895cd93ae5d090458e8f7b5f5803aa Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Tue, 6 Oct 2015 17:59:10 +0000 Subject: [PATCH] c-parser.c (c_parser_statement_after_labels): Use protected_set_expr_location. * c-parser.c (c_parser_statement_after_labels): Use protected_set_expr_location. (c_parser_omp_clause_num_gangs): Likewise. (c_parser_omp_clause_num_threads): Likewise. (c_parser_omp_clause_num_workers): Likewise. (c_parser_omp_clause_vector_length): Likewise. (c_parser_omp_clause_num_teams): Likewise. (c_parser_omp_clause_thread_limit): Likewise. * c-typeck.c (build_c_cast): Likewise. (c_cast_expr): Likewise. From-SVN: r228541 --- gcc/c/ChangeLog | 13 +++++++++++++ gcc/c/c-parser.c | 23 ++++++++--------------- gcc/c/c-typeck.c | 7 +++---- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index dfa2787c548..f87a29a07d1 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,16 @@ +2015-10-06 Marek Polacek + + * c-parser.c (c_parser_statement_after_labels): Use + protected_set_expr_location. + (c_parser_omp_clause_num_gangs): Likewise. + (c_parser_omp_clause_num_threads): Likewise. + (c_parser_omp_clause_num_workers): Likewise. + (c_parser_omp_clause_vector_length): Likewise. + (c_parser_omp_clause_num_teams): Likewise. + (c_parser_omp_clause_thread_limit): Likewise. + * c-typeck.c (build_c_cast): Likewise. + (c_cast_expr): Likewise. + 2015-10-05 Richard Sandiford * c-typeck.c (c_tree_equal): Use real_equal instead of diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c index 0df7d7bb01e..2d24c212937 100644 --- a/gcc/c/c-parser.c +++ b/gcc/c/c-parser.c @@ -5141,9 +5141,8 @@ c_parser_statement_after_labels (c_parser *parser, vec *chain) (recursively) all of the component statements should already have line numbers assigned. ??? Can we discard no-op statements earlier? */ - if (CAN_HAVE_LOCATION_P (stmt) - && EXPR_LOCATION (stmt) == UNKNOWN_LOCATION) - SET_EXPR_LOCATION (stmt, loc); + if (EXPR_LOCATION (stmt) == UNKNOWN_LOCATION) + protected_set_expr_location (stmt, loc); parser->in_if_block = in_if_block; } @@ -10681,8 +10680,7 @@ c_parser_omp_clause_num_gangs (c_parser *parser, tree list) /* Attempt to statically determine when the number isn't positive. */ c = fold_build2_loc (expr_loc, LE_EXPR, boolean_type_node, t, build_int_cst (TREE_TYPE (t), 0)); - if (CAN_HAVE_LOCATION_P (c)) - SET_EXPR_LOCATION (c, expr_loc); + protected_set_expr_location (c, expr_loc); if (c == boolean_true_node) { warning_at (expr_loc, 0, @@ -10726,8 +10724,7 @@ c_parser_omp_clause_num_threads (c_parser *parser, tree list) /* Attempt to statically determine when the number isn't positive. */ c = fold_build2_loc (expr_loc, LE_EXPR, boolean_type_node, t, build_int_cst (TREE_TYPE (t), 0)); - if (CAN_HAVE_LOCATION_P (c)) - SET_EXPR_LOCATION (c, expr_loc); + protected_set_expr_location (c, expr_loc); if (c == boolean_true_node) { warning_at (expr_loc, 0, @@ -10771,8 +10768,7 @@ c_parser_omp_clause_num_workers (c_parser *parser, tree list) /* Attempt to statically determine when the number isn't positive. */ c = fold_build2_loc (expr_loc, LE_EXPR, boolean_type_node, t, build_int_cst (TREE_TYPE (t), 0)); - if (CAN_HAVE_LOCATION_P (c)) - SET_EXPR_LOCATION (c, expr_loc); + protected_set_expr_location (c, expr_loc); if (c == boolean_true_node) { warning_at (expr_loc, 0, @@ -11116,8 +11112,7 @@ c_parser_omp_clause_vector_length (c_parser *parser, tree list) /* Attempt to statically determine when the number isn't positive. */ c = fold_build2_loc (expr_loc, LE_EXPR, boolean_type_node, t, build_int_cst (TREE_TYPE (t), 0)); - if (CAN_HAVE_LOCATION_P (c)) - SET_EXPR_LOCATION (c, expr_loc); + protected_set_expr_location (c, expr_loc); if (c == boolean_true_node) { warning_at (expr_loc, 0, @@ -11193,8 +11188,7 @@ c_parser_omp_clause_num_teams (c_parser *parser, tree list) /* Attempt to statically determine when the number isn't positive. */ c = fold_build2_loc (expr_loc, LE_EXPR, boolean_type_node, t, build_int_cst (TREE_TYPE (t), 0)); - if (CAN_HAVE_LOCATION_P (c)) - SET_EXPR_LOCATION (c, expr_loc); + protected_set_expr_location (c, expr_loc); if (c == boolean_true_node) { warning_at (expr_loc, 0, "% value must be positive"); @@ -11237,8 +11231,7 @@ c_parser_omp_clause_thread_limit (c_parser *parser, tree list) /* Attempt to statically determine when the number isn't positive. */ c = fold_build2_loc (expr_loc, LE_EXPR, boolean_type_node, t, build_int_cst (TREE_TYPE (t), 0)); - if (CAN_HAVE_LOCATION_P (c)) - SET_EXPR_LOCATION (c, expr_loc); + protected_set_expr_location (c, expr_loc); if (c == boolean_true_node) { warning_at (expr_loc, 0, "% value must be positive"); diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index 10cad367bb2..df3245a49b5 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -5216,8 +5216,7 @@ build_c_cast (location_t loc, tree type, tree expr) || TREE_CODE (expr) == COMPLEX_CST))) value = build1 (NOP_EXPR, type, value); - if (CAN_HAVE_LOCATION_P (value)) - SET_EXPR_LOCATION (value, loc); + protected_set_expr_location (value, loc); return value; } @@ -5255,8 +5254,8 @@ c_cast_expr (location_t loc, struct c_type_name *type_name, tree expr) SET_EXPR_LOCATION (ret, loc); } - if (CAN_HAVE_LOCATION_P (ret) && !EXPR_HAS_LOCATION (ret)) - SET_EXPR_LOCATION (ret, loc); + if (!EXPR_HAS_LOCATION (ret)) + protected_set_expr_location (ret, loc); /* C++ does not permits types to be defined in a cast, but it allows references to incomplete types. */ -- 2.30.2