===================================================================
@@ -1612,7 +1612,8 @@ struct GTY(()) tree_constructor {
#define EXPR_LOCATION(NODE) \
(CAN_HAVE_LOCATION_P ((NODE)) ? (NODE)->exp.locus : UNKNOWN_LOCATION)
#define SET_EXPR_LOCATION(NODE, LOCUS) EXPR_CHECK ((NODE))->exp.locus = (LOCUS)
-#define EXPR_HAS_LOCATION(NODE) (!IS_UNKNOWN_LOCATION (EXPR_LOCATION (NODE)))
+#define EXPR_HAS_LOCATION(NODE) (LOCATION_LOCUS (EXPR_LOCATION (NODE)) \
+ != UNKNOWN_LOCATION)
/* The location to be used in a diagnostic about this expression. Do not
use this macro if the location will be assigned to other expressions. */
#define EXPR_LOC_OR_HERE(NODE) (EXPR_HAS_LOCATION (NODE) ? (NODE)->exp.locus : input_location)
@@ -1791,7 +1792,8 @@ extern void protected_set_expr_location (tree, loc
OMP_CLAUSE_PRIVATE, \
OMP_CLAUSE_COPYPRIVATE), 0)
#define OMP_CLAUSE_HAS_LOCATION(NODE) \
- (!IS_UNKNOWN_LOCATION ((OMP_CLAUSE_CHECK (NODE))->omp_clause.locus))
+ (LOCATION_LOCUS ((OMP_CLAUSE_CHECK (NODE))->omp_clause.locus) \
+ != UNKNOWN_LOCATION)
#define OMP_CLAUSE_LOCATION(NODE) (OMP_CLAUSE_CHECK (NODE))->omp_clause.locus
/* True on an OMP_SECTION statement that was the last lexical member.
@@ -5535,7 +5537,7 @@ function_args_iter_next (function_args_iterator *i
static inline bool
inlined_function_outer_scope_p (const_tree block)
{
- return !IS_UNKNOWN_LOCATION (BLOCK_SOURCE_LOCATION (block));
+ return LOCATION_LOCUS (BLOCK_SOURCE_LOCATION (block)) != UNKNOWN_LOCATION;
}
/* Loop over all function arguments of FNTYPE. In each iteration, PTR is set
===================================================================
@@ -56,9 +56,6 @@ extern location_t input_location;
#define LOCATION_BLOCK(LOC) \
((tree) ((IS_ADHOC_LOC (LOC)) ? get_data_from_adhoc_loc (line_table, (LOC)) \
: NULL))
-#define IS_UNKNOWN_LOCATION(LOC) \
- ((IS_ADHOC_LOC (LOC)) ? get_location_from_adhoc_loc (line_table, LOC) == 0 \
- : (LOC) == 0)
#define input_line LOCATION_LINE (input_location)
#define input_filename LOCATION_FILE (input_location)
===================================================================
@@ -145,7 +145,7 @@ static location_t
expr_location_or (tree t, location_t loc)
{
location_t tloc = EXPR_LOCATION (t);
- return IS_UNKNOWN_LOCATION (tloc) ? loc : tloc;
+ return tloc == UNKNOWN_LOCATION ? loc : tloc;
}
/* Similar to protected_set_expr_location, but never modify x in place,
===================================================================
@@ -1412,7 +1412,7 @@ output_node_opt_summary (struct output_block *ob,
mechanism to store function local declarations into summaries. */
gcc_assert (parm);
streamer_write_uhwi (ob, parm_num);
- gcc_assert (IS_UNKNOWN_LOCATION (EXPR_LOCATION (map->new_tree)));
+ gcc_assert (EXPR_LOCATION (map->new_tree) == UNKNOWN_LOCATION);
stream_write_tree (ob, map->new_tree, true);
bp = bitpack_create (ob->main_stream);
bp_pack_value (&bp, map->replace_p, 1);
===================================================================
@@ -15552,7 +15552,7 @@ add_src_coords_attributes (dw_die_ref die, tree de
{
expanded_location s;
- if (IS_UNKNOWN_LOCATION (DECL_SOURCE_LOCATION (decl)))
+ if (LOCATION_LOCUS (DECL_SOURCE_LOCATION (decl)) == UNKNOWN_LOCATION)
return;
s = expand_location (DECL_SOURCE_LOCATION (decl));
add_AT_file (die, DW_AT_decl_file, lookup_filename (s.file));
===================================================================
@@ -885,7 +885,7 @@ lower_try_finally_dup_block (gimple_seq seq, struc
for (gsi = gsi_start (new_seq); !gsi_end_p (gsi); gsi_next (&gsi))
{
gimple stmt = gsi_stmt (gsi);
- if (IS_UNKNOWN_LOCATION (gimple_location (stmt)))
+ if (LOCATION_LOCUS (gimple_location (stmt)) == UNKNOWN_LOCATION)
{
tree block = gimple_block (stmt);
gimple_set_location (stmt, loc);
===================================================================
@@ -1123,7 +1123,7 @@ branch_prob (void)
is not computed twice. */
if (last
&& gimple_has_location (last)
- && !IS_UNKNOWN_LOCATION (e->goto_locus)
+ && LOCATION_LOCUS (e->goto_locus) != UNKNOWN_LOCATION
&& !single_succ_p (bb)
&& (LOCATION_FILE (e->goto_locus)
!= LOCATION_FILE (gimple_location (last))
@@ -1344,7 +1344,8 @@ branch_prob (void)
/* Notice GOTO expressions eliminated while constructing the CFG. */
if (single_succ_p (bb)
- && !IS_UNKNOWN_LOCATION (single_succ_edge (bb)->goto_locus))
+ && LOCATION_LOCUS (single_succ_edge (bb)->goto_locus)
+ != UNKNOWN_LOCATION)
{
expanded_location curr_location
= expand_location (single_succ_edge (bb)->goto_locus);
===================================================================
@@ -1838,7 +1838,7 @@ expand_gimple_cond (basic_block bb, gimple stmt)
jumpif_1 (code, op0, op1, label_rtx_for_bb (true_edge->dest),
true_edge->probability);
maybe_dump_rtl_for_gimple_stmt (stmt, last);
- if (!IS_UNKNOWN_LOCATION (true_edge->goto_locus))
+ if (true_edge->goto_locus != UNKNOWN_LOCATION)
set_curr_insn_location (true_edge->goto_locus);
false_edge->flags |= EDGE_FALLTHRU;
maybe_cleanup_end_of_block (false_edge, last);
@@ -1849,7 +1849,7 @@ expand_gimple_cond (basic_block bb, gimple stmt)
jumpifnot_1 (code, op0, op1, label_rtx_for_bb (false_edge->dest),
false_edge->probability);
maybe_dump_rtl_for_gimple_stmt (stmt, last);
- if (!IS_UNKNOWN_LOCATION (false_edge->goto_locus))
+ if (false_edge->goto_locus != UNKNOWN_LOCATION)
set_curr_insn_location (false_edge->goto_locus);
true_edge->flags |= EDGE_FALLTHRU;
maybe_cleanup_end_of_block (true_edge, last);
@@ -1859,7 +1859,7 @@ expand_gimple_cond (basic_block bb, gimple stmt)
jumpif_1 (code, op0, op1, label_rtx_for_bb (true_edge->dest),
true_edge->probability);
last = get_last_insn ();
- if (!IS_UNKNOWN_LOCATION (false_edge->goto_locus))
+ if (false_edge->goto_locus != UNKNOWN_LOCATION)
set_curr_insn_location (false_edge->goto_locus);
emit_jump (label_rtx_for_bb (false_edge->dest));
@@ -1885,7 +1885,7 @@ expand_gimple_cond (basic_block bb, gimple stmt)
maybe_dump_rtl_for_gimple_stmt (stmt, last2);
- if (!IS_UNKNOWN_LOCATION (true_edge->goto_locus))
+ if (true_edge->goto_locus != UNKNOWN_LOCATION)
{
set_curr_insn_location (true_edge->goto_locus);
true_edge->goto_locus = curr_insn_location ();
@@ -3973,7 +3973,7 @@ expand_gimple_basic_block (basic_block bb)
/* Expand implicit goto and convert goto_locus. */
FOR_EACH_EDGE (e, ei, bb->succs)
{
- if (!IS_UNKNOWN_LOCATION (e->goto_locus))
+ if (e->goto_locus != UNKNOWN_LOCATION)
set_curr_insn_location (e->goto_locus);
if ((e->flags & EDGE_FALLTHRU) && e->dest != bb->next_bb)
{
@@ -4094,7 +4094,7 @@ construct_exit_block (void)
/* Make sure the locus is set to the end of the function, so that
epilogue line numbers and warnings are set properly. */
- if (!IS_UNKNOWN_LOCATION (cfun->function_end_locus))
+ if (LOCATION_LOCUS (cfun->function_end_locus) != UNKNOWN_LOCATION)
input_location = cfun->function_end_locus;
/* Generate rtl for function exit. */
@@ -4318,7 +4318,7 @@ gimple_expand_cfg (void)
if (!DECL_IS_BUILTIN (current_function_decl))
{
/* Eventually, all FEs should explicitly set function_start_locus. */
- if (IS_UNKNOWN_LOCATION (cfun->function_start_locus))
+ if (LOCATION_LOCUS (cfun->function_start_locus) == UNKNOWN_LOCATION)
set_curr_insn_location
(DECL_SOURCE_LOCATION (current_function_decl));
else
===================================================================
@@ -481,15 +481,15 @@ try_forward_edges (int mode, basic_block b)
int new_locus = single_succ_edge (target)->goto_locus;
int locus = goto_locus;
- if (!IS_UNKNOWN_LOCATION (new_locus)
- && !IS_UNKNOWN_LOCATION (locus)
+ if (new_locus != UNKNOWN_LOCATION
+ && locus != UNKNOWN_LOCATION
&& new_locus != locus)
new_target = NULL;
else
{
rtx last;
- if (!IS_UNKNOWN_LOCATION (new_locus))
+ if (new_locus != UNKNOWN_LOCATION)
locus = new_locus;
last = BB_END (target);
@@ -499,13 +499,13 @@ try_forward_edges (int mode, basic_block b)
new_locus = last && INSN_P (last)
? INSN_LOCATION (last) : 0;
- if (!IS_UNKNOWN_LOCATION (new_locus)
- && !IS_UNKNOWN_LOCATION (locus)
+ if (new_locus != UNKNOWN_LOCATION
+ && locus != UNKNOWN_LOCATION
&& new_locus != locus)
new_target = NULL;
else
{
- if (!IS_UNKNOWN_LOCATION (new_locus))
+ if (new_locus != UNKNOWN_LOCATION)
locus = new_locus;
goto_locus = locus;
===================================================================
@@ -597,7 +597,8 @@ remove_unused_scope_block_p (tree scope)
else
/* Verfify that only blocks with source location set
are entry points to the inlined functions. */
- gcc_assert (IS_UNKNOWN_LOCATION (BLOCK_SOURCE_LOCATION (scope)));
+ gcc_assert (LOCATION_LOCUS (BLOCK_SOURCE_LOCATION (scope))
+ == UNKNOWN_LOCATION);
TREE_USED (scope) = !unused;
return unused;
@@ -671,7 +672,7 @@ dump_scope_block (FILE *file, int indent, tree sco
fprintf (file, "\n%*s{ Scope block #%i%s%s",indent, "" , BLOCK_NUMBER (scope),
TREE_USED (scope) ? "" : " (unused)",
BLOCK_ABSTRACT (scope) ? " (abstract)": "");
- if (!IS_UNKNOWN_LOCATION (BLOCK_SOURCE_LOCATION (scope)))
+ if (LOCATION_LOCUS (BLOCK_SOURCE_LOCATION (scope)) != UNKNOWN_LOCATION)
{
expanded_location s = expand_location (BLOCK_SOURCE_LOCATION (scope));
fprintf (file, " %s:%i", s.file, s.line);
===================================================================
@@ -3165,7 +3165,7 @@ ipa_write_jump_function (struct output_block *ob,
break;
case IPA_JF_CONST:
gcc_assert (
- IS_UNKNOWN_LOCATION (EXPR_LOCATION (jump_func->value.constant)));
+ EXPR_LOCATION (jump_func->value.constant) == UNKNOWN_LOCATION);
stream_write_tree (ob, jump_func->value.constant, true);
break;
case IPA_JF_PASS_THROUGH:
===================================================================
@@ -829,7 +829,8 @@ extern void rtl_check_failed_flag (const char *, c
#define INSN_LOCATION(INSN) XUINT (INSN, 5)
-#define INSN_HAS_LOCATION(INSN) (!IS_UNKNOWN_LOCATION (INSN_LOCATION (INSN)))
+#define INSN_HAS_LOCATION(INSN) ((LOCATION_LOCUS (INSN_LOCATION (INSN)))\
+ != UNKNOWN_LOCATION)
/* LOCATION of an RTX if relevant. */
#define RTL_LOCATION(X) (INSN_P (X) ? \
===================================================================
@@ -1240,7 +1240,7 @@ gimple_set_location (gimple g, location_t location
static inline bool
gimple_has_location (const_gimple g)
{
- return !IS_UNKNOWN_LOCATION (gimple_location (g));
+ return LOCATION_LOCUS (gimple_location (g)) != UNKNOWN_LOCATION;
}
===================================================================
@@ -723,7 +723,7 @@ unique_locus_on_edge_between_p (basic_block a, bas
const location_t goto_locus = EDGE_SUCC (a, 0)->goto_locus;
rtx insn, end;
- if (IS_UNKNOWN_LOCATION (goto_locus))
+ if (LOCATION_LOCUS (goto_locus) == UNKNOWN_LOCATION)
return false;
/* First scan block A backward. */
@@ -1477,10 +1477,7 @@ force_nonfallthru_and_redirect (edge e, basic_bloc
else
jump_block = e->src;
- if (!IS_UNKNOWN_LOCATION (e->goto_locus))
- loc = e->goto_locus;
- else
- loc = 0;
+ loc = e->goto_locus;
e->flags &= ~EDGE_FALLTHRU;
if (target == EXIT_BLOCK_PTR)
{
@@ -3335,7 +3332,7 @@ fixup_reorder_chain (void)
edge_iterator ei;
FOR_EACH_EDGE (e, ei, bb->succs)
- if (!IS_UNKNOWN_LOCATION (e->goto_locus)
+ if (LOCATION_LOCUS (e->goto_locus) != UNKNOWN_LOCATION
&& !(e->flags & EDGE_ABNORMAL))
{
edge e2;
@@ -3385,7 +3382,7 @@ fixup_reorder_chain (void)
well, this can prevent other such blocks from being created
in subsequent iterations of the loop. */
for (ei2 = ei_start (dest->preds); (e2 = ei_safe_edge (ei2)); )
- if (!IS_UNKNOWN_LOCATION (e2->goto_locus)
+ if (LOCATION_LOCUS (e2->goto_locus) != UNKNOWN_LOCATION
&& !(e2->flags & (EDGE_ABNORMAL | EDGE_FALLTHRU))
&& e->goto_locus == e2->goto_locus)
redirect_edge_and_branch (e2, nb);
@@ -4087,7 +4084,8 @@ cfg_layout_merge_blocks (basic_block a, basic_bloc
}
/* If B was a forwarder block, propagate the locus on the edge. */
- if (forwarder_p && IS_UNKNOWN_LOCATION (EDGE_SUCC (b, 0)->goto_locus))
+ if (forwarder_p
+ && LOCATION_LOCUS (EDGE_SUCC (b, 0)->goto_locus) != UNKNOWN_LOCATION)
EDGE_SUCC (b, 0)->goto_locus = EDGE_SUCC (a, 0)->goto_locus;
if (dump_file)