Revert "Remove MAY_HAVE_DEBUG_MARKER_STMTS and MAY_HAVE_DEBUG_BIND_STMTS."

This reverts commit 206b22d021d94adbaa79e1d443c87415254b15de.

diff --git a/gcc/c-family/c-gimplify.c b/gcc/c-family/c-gimplify.c
index d9cf051a680738d401d74725462314292c78cb1c..0d38b706f4c2398cd32ed300aaeef60746f36d13 100644 (file)
--- a/gcc/c-family/c-gimplify.c
+++ b/gcc/c-family/c-gimplify.c
@@ -295,7 +295,7 @@ genericize_c_loop (tree *stmt_p, location_t start_locus, tree cond, tree body,
   finish_bc_block (&stmt_list, bc_continue, clab);
   if (incr)
     {
-      if (debug_nonbind_markers_p && incr_locus != UNKNOWN_LOCATION)
+      if (MAY_HAVE_DEBUG_MARKER_STMTS && incr_locus != UNKNOWN_LOCATION)
        {
          tree d = build0 (DEBUG_BEGIN_STMT, void_type_node);
          SET_EXPR_LOCATION (d, expr_loc_or_loc (incr, start_locus));
@@ -305,7 +305,7 @@ genericize_c_loop (tree *stmt_p, location_t start_locus, tree cond, tree body,
     }
   append_to_statement_list (entry, &stmt_list);
 
-  if (debug_nonbind_markers_p && cond_locus != UNKNOWN_LOCATION)
+  if (MAY_HAVE_DEBUG_MARKER_STMTS && cond_locus != UNKNOWN_LOCATION)
     {
       tree d = build0 (DEBUG_BEGIN_STMT, void_type_node);
       SET_EXPR_LOCATION (d, cond_locus);

diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 81eea18dc88fee83d3e148cfd4784ab21c7576e6..f312630448fd6feeb93b9ab743c49fc4ba30b3ab 100644 (file)
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -1791,7 +1791,7 @@ static void
 add_debug_begin_stmt (location_t loc)
 {
   /* Don't add DEBUG_BEGIN_STMTs outside of functions, see PR84721.  */
-  if (!debug_nonbind_markers_p || !building_stmt_list_p ())
+  if (!MAY_HAVE_DEBUG_MARKER_STMTS || !building_stmt_list_p ())
     return;
 
   tree stmt = build0 (DEBUG_BEGIN_STMT, void_type_node);

diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index 4e6f776250fc453df451ece1cbeb3f305b39d954..eb6466f4be6f72f589abb1055f69d0d323af5c80 100644 (file)
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -6587,7 +6587,7 @@ pass_expand::execute (function *fun)
   timevar_pop (TV_OUT_OF_SSA);
   SA.partition_to_pseudo = XCNEWVEC (rtx, SA.map->num_partitions);
 
-  if (flag_var_tracking_assignments && flag_tree_ter)
+  if (MAY_HAVE_DEBUG_BIND_STMTS && flag_tree_ter)
     {
       gimple_stmt_iterator gsi;
       FOR_EACH_BB_FN (bb, cfun)

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 65f0f112011a29b9b7d861a72ed89d9b12ac2a5e..aa7f0e4b526b8353cf67aaaf90d627905afa450e 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -11698,7 +11698,7 @@ cp_parser_lambda_body (cp_parser* parser, tree lambda_expr)
 static void
 add_debug_begin_stmt (location_t loc)
 {
-  if (!debug_nonbind_markers_p)
+  if (!MAY_HAVE_DEBUG_MARKER_STMTS)
     return;
   if (DECL_DECLARED_CONCEPT_P (current_function_decl))
     /* A concept is never expanded normally.  */

diff --git a/gcc/function.c b/gcc/function.c
index 1bebe8aaee8ecbfdac6ff0a3ef798af3c96d8fda..61b3bd036b877763133e2abdd5f6ef157085765c 100644 (file)
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -4872,7 +4872,7 @@ allocate_struct_function (tree fndecl, bool abstract_p)
      disabled.  The markers make little sense without the variable
      binding annotations among them.  */
   cfun->debug_nonbind_markers = lang_hooks.emits_begin_stmt
-    && debug_nonbind_markers_p;
+    && MAY_HAVE_DEBUG_MARKER_STMTS;
 }
 
 /* This is like allocate_struct_function, but pushes a new cfun for FNDECL

diff --git a/gcc/gimple-low.c b/gcc/gimple-low.c
index 7d9b3df2ffbd61272cf14f41b5c9ff75ef6fc32b..7e39c22df4411db5cb2dfb9d54b8f57f9960b595 100644 (file)
--- a/gcc/gimple-low.c
+++ b/gcc/gimple-low.c
@@ -114,7 +114,7 @@ lower_function_body (void)
   /* If we had begin stmt markers from e.g. PCH, but this compilation
      doesn't want them, lower_stmt will have cleaned them up; we can
      now clear the flag that indicates we had them.  */
-  if (!debug_nonbind_markers_p && cfun->debug_nonbind_markers)
+  if (!MAY_HAVE_DEBUG_MARKER_STMTS && cfun->debug_nonbind_markers)
     {
       /* This counter needs not be exact, but before lowering it will
         most certainly be.  */
@@ -316,7 +316,7 @@ lower_stmt (gimple_stmt_iterator *gsi, struct lower_data *data)
       /* Propagate fallthruness.  */
       /* If the function (e.g. from PCH) had debug stmts, but they're
         disabled for this compilation, remove them.  */
-      if (!debug_nonbind_markers_p)
+      if (!MAY_HAVE_DEBUG_MARKER_STMTS)
        gsi_remove (gsi, true);
       else
        gsi_next (gsi);

diff --git a/gcc/gimple-ssa-backprop.c b/gcc/gimple-ssa-backprop.c
index 3705c106fcc802c112e21d9f78dd50aec624bfc7..4b62bb92a21d6b76700a7cfc359f28b8c5a137ab 100644 (file)
--- a/gcc/gimple-ssa-backprop.c
+++ b/gcc/gimple-ssa-backprop.c
@@ -737,7 +737,7 @@ strip_sign_op (tree rhs)
 void
 backprop::prepare_change (tree var)
 {
-  if (flag_var_tracking_assignments)
+  if (MAY_HAVE_DEBUG_BIND_STMTS)
     insert_debug_temp_for_var_def (NULL, var);
   reset_flow_sensitive_info (var);
 }

diff --git a/gcc/ipa-param-manipulation.c b/gcc/ipa-param-manipulation.c
index ba897bb96f24a012b095738f5af936eefee5365a..cec1dba701f0d99bf5cf2b1bf592a2287c03a992 100644 (file)
--- a/gcc/ipa-param-manipulation.c
+++ b/gcc/ipa-param-manipulation.c
@@ -832,7 +832,7 @@ ipa_param_adjustments::modify_call (cgraph_edge *cs,
      vector to say for debug info that if parameter parm had been passed,
      it would have value parm_Y(D).  */
   tree old_decl = gimple_call_fndecl (stmt);
-  if (flag_var_tracking_assignments && old_decl && callee_decl)
+  if (MAY_HAVE_DEBUG_BIND_STMTS && old_decl && callee_decl)
     {
       vec<tree, va_gc> **debug_args = NULL;
       unsigned i = 0;

diff --git a/gcc/ipa-split.c b/gcc/ipa-split.c
index 65377678557249649b63acb6730c5c51c1edd86f..c68577d04a9940380c813dfb1821bc4b62bc4c1f 100644 (file)
--- a/gcc/ipa-split.c
+++ b/gcc/ipa-split.c
@@ -1465,7 +1465,7 @@ split_function (basic_block return_bb, class split_point *split_point,
     {
       vec<tree, va_gc> **debug_args = NULL;
       unsigned i = 0, len = 0;
-      if (flag_var_tracking_assignments)
+      if (MAY_HAVE_DEBUG_BIND_STMTS)
        {
          debug_args = decl_debug_args_lookup (node->decl);
          if (debug_args)
@@ -1479,11 +1479,11 @@ split_function (basic_block return_bb, class split_point *split_point,
            gimple *def_temp;
 
            /* This needs to be done even without
-              flag_var_tracking_assignments, otherwise if it didn't exist
+              MAY_HAVE_DEBUG_BIND_STMTS, otherwise if it didn't exist
               before, we'd end up with different SSA_NAME_VERSIONs
               between -g and -g0.  */
            arg = get_or_create_ssa_default_def (cfun, parm);
-           if (!flag_var_tracking_assignments || debug_args == NULL)
+           if (!MAY_HAVE_DEBUG_BIND_STMTS || debug_args == NULL)
              continue;
 
            while (i < len && (**debug_args)[i] != DECL_ORIGIN (parm))

diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c
index 4165892d46628e320b40ead753299b9ac31b8b2b..eb8a7dc57b0041147c47aa9beaa09b5931684a41 100644 (file)
--- a/gcc/lto-streamer-in.c
+++ b/gcc/lto-streamer-in.c
@@ -1454,8 +1454,8 @@ input_function (tree fn_decl, class data_in *data_in,
            {
              if (is_gimple_debug (stmt)
                  && (gimple_debug_nonbind_marker_p (stmt)
-                     ? !debug_nonbind_markers_p
-                     : !flag_var_tracking_assignments))
+                     ? !MAY_HAVE_DEBUG_MARKER_STMTS
+                     : !MAY_HAVE_DEBUG_BIND_STMTS))
                remove = true;
              /* In case the linemap overflows locations can be dropped
                 to zero.  Thus do not keep nonsensical inline entry markers

diff --git a/gcc/sese.c b/gcc/sese.c
index 5ddbb0b9532e1c92b7576dbfd652fe26ae276ce2..ca88f9bbfdf185f67be4d87693f910924fae8b16 100644 (file)
--- a/gcc/sese.c
+++ b/gcc/sese.c
@@ -205,7 +205,7 @@ void
 sese_insert_phis_for_liveouts (sese_info_p region, basic_block bb,
                               edge false_e, edge true_e)
 {
-  if (flag_var_tracking_assignments)
+  if (MAY_HAVE_DEBUG_BIND_STMTS)
     sese_reset_debug_liveouts (region);
 
   unsigned i;

diff --git a/gcc/ssa-iterators.h b/gcc/ssa-iterators.h
index 3e26ce051bf3138286d55263ada4d609d84ad7a2..f70b0a42368d7e2a0fe8cb94997751b16e37a422 100644 (file)
--- a/gcc/ssa-iterators.h
+++ b/gcc/ssa-iterators.h
@@ -456,7 +456,7 @@ num_imm_uses (const_tree var)
   const ssa_use_operand_t *ptr;
   unsigned int num = 0;
 
-  if (!flag_var_tracking_assignments)
+  if (!MAY_HAVE_DEBUG_BIND_STMTS)
     {
       for (ptr = start->next; ptr != start; ptr = ptr->next)
        if (USE_STMT (ptr))

diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index cde606e1a40eff4f92b6eb5bb8d6632123bfa48a..8ed8c69b5b1f9626e5a13468ce1ae71a418e5532 100644 (file)
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -614,7 +614,7 @@ make_blocks (gimple_seq seq)
      latest (earliest we find) label, and moving debug stmts that are
      not separated from it by nondebug nonlabel stmts after the
      label.  */
-  if (debug_nonbind_markers_p)
+  if (MAY_HAVE_DEBUG_MARKER_STMTS)
     {
       gimple_stmt_iterator label = gsi_none ();
 
@@ -2139,7 +2139,7 @@ gimple_merge_blocks (basic_block a, basic_block b)
                gsi_insert_before (&dest_gsi, stmt, GSI_NEW_STMT);
            }
          /* Other user labels keep around in a form of a debug stmt.  */
-         else if (!DECL_ARTIFICIAL (label) && flag_var_tracking_assignments)
+         else if (!DECL_ARTIFICIAL (label) && MAY_HAVE_DEBUG_BIND_STMTS)
            {
              gimple *dbg = gimple_build_debug_bind (label,
                                                     integer_zero_node,

diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index a483b9b8fb2a887104fdc2bd7943f0f808354edc..8c108d8e4e701fa0ef1cbd0a831ef1f9f05b4bcb 100644 (file)
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -6432,7 +6432,7 @@ tree_function_versioning (tree old_decl, tree new_decl,
        }
     }
 
-  if (param_body_adjs && flag_var_tracking_assignments)
+  if (param_body_adjs && MAY_HAVE_DEBUG_BIND_STMTS)
     {
       vec<tree, va_gc> **debug_args = NULL;
       unsigned int len = 0;

diff --git a/gcc/tree-loop-distribution.c b/gcc/tree-loop-distribution.c
index 1f2d0329b5eb54579d8595bdb4f2ebd072d12813..583c01a42d86adf8a32bb2db1bdc072d11c0b330 100644 (file)
--- a/gcc/tree-loop-distribution.c
+++ b/gcc/tree-loop-distribution.c
@@ -1000,7 +1000,7 @@ generate_loops_for_partition (class loop *loop, partition *partition,
   /* Remove stmts not in the PARTITION bitmap.  */
   bbs = get_loop_body_in_dom_order (loop);
 
-  if (flag_var_tracking_assignments)
+  if (MAY_HAVE_DEBUG_BIND_STMTS)
     for (i = 0; i < loop->num_nodes; i++)
       {
        basic_block bb = bbs[i];

diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index 10acd5e137b373c603f9c227436dc5333041343e..76e3aae405c1304c37c42dec79c847311f6f7604 100644 (file)
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -2588,7 +2588,7 @@ analyze_access_subtree (struct access *root, struct access *parent,
          gcc_checking_assert (!root->grp_scalar_read
                               && !root->grp_assignment_read);
          sth_created = true;
-         if (flag_var_tracking_assignments)
+         if (MAY_HAVE_DEBUG_BIND_STMTS)
            {
              root->grp_to_be_debug_replaced = 1;
              root->replacement_decl = create_access_replacement (root);

diff --git a/gcc/tree-ssa-dce.c b/gcc/tree-ssa-dce.c
index 27aa74fd29875a43e97ea5801e80c945b0d8ac45..dbf02c434de48af1ee13ef384e7a6266b08a58c9 100644 (file)
--- a/gcc/tree-ssa-dce.c
+++ b/gcc/tree-ssa-dce.c
@@ -1143,7 +1143,7 @@ remove_dead_stmt (gimple_stmt_iterator *i, basic_block bb,
 
   /* If this is a store into a variable that is being optimized away,
      add a debug bind stmt if possible.  */
-  if (flag_var_tracking_assignments
+  if (MAY_HAVE_DEBUG_BIND_STMTS
       && gimple_assign_single_p (stmt)
       && is_gimple_val (gimple_assign_rhs1 (stmt)))
     {

diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c
index 2dad54d90ad44faeaaa67cdc49cf06f95d9bd365..5a7fd305d91da7bd66a7a2132b230fd55ba976a7 100644 (file)
--- a/gcc/tree-ssa-loop-ivopts.c
+++ b/gcc/tree-ssa-loop-ivopts.c
@@ -7670,7 +7670,7 @@ remove_unused_ivs (struct ivopts_data *data, bitmap toremove)
 
          tree def = info->iv->ssa_name;
 
-         if (flag_var_tracking_assignments && SSA_NAME_DEF_STMT (def))
+         if (MAY_HAVE_DEBUG_BIND_STMTS && SSA_NAME_DEF_STMT (def))
            {
              imm_use_iterator imm_iter;
              use_operand_p use_p;

diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c
index 1abc4ea21cca6f34bbdc3b60f86127b2414971a1..2fa7069f824c69b58a5c65eb76a7b1e9441d5af6 100644 (file)
--- a/gcc/tree-ssa-phiopt.c
+++ b/gcc/tree-ssa-phiopt.c
@@ -2406,7 +2406,7 @@ spaceship_replacement (basic_block cond_bb, basic_block middle_bb,
     }
   update_stmt (use_stmt);
 
-  if (flag_var_tracking_assignments)
+  if (MAY_HAVE_DEBUG_BIND_STMTS)
     {
       use_operand_p use_p;
       imm_use_iterator iter;

diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c
index 5c748ad83b4ad93f1b64ab793c5b37acca955a10..65316223047924965e31d075ce3d851bca79620b 100644 (file)
--- a/gcc/tree-ssa-reassoc.c
+++ b/gcc/tree-ssa-reassoc.c
@@ -233,7 +233,7 @@ reassoc_remove_stmt (gimple_stmt_iterator *gsi)
 {
   gimple *stmt = gsi_stmt (*gsi);
 
-  if (!flag_var_tracking_assignments || gimple_code (stmt) == GIMPLE_PHI)
+  if (!MAY_HAVE_DEBUG_BIND_STMTS || gimple_code (stmt) == GIMPLE_PHI)
     return gsi_remove (gsi, true);
 
   gimple_stmt_iterator prev = *gsi;

diff --git a/gcc/tree-ssa-tail-merge.c b/gcc/tree-ssa-tail-merge.c
index 5487679e01dc4383d797cef0301593baa3459b77..48f94217d16ede158d81ef2d3d556c6548a54e8c 100644 (file)
--- a/gcc/tree-ssa-tail-merge.c
+++ b/gcc/tree-ssa-tail-merge.c
@@ -1796,7 +1796,7 @@ tail_merge_optimize (unsigned int todo)
 
   if (nr_bbs_removed_total > 0)
     {
-      if (flag_var_tracking_assignments)
+      if (MAY_HAVE_DEBUG_BIND_STMTS)
        {
          calculate_dominance_info (CDI_DOMINATORS);
          update_debug_stmts ();

diff --git a/gcc/tree-ssa-threadedge.c b/gcc/tree-ssa-threadedge.c
index 813137ec6da009dbc91ec27ec42349935cf5c592..891c62aaf8532f77fde58ae756d90292c5eacb39 100644 (file)
--- a/gcc/tree-ssa-threadedge.c
+++ b/gcc/tree-ssa-threadedge.c
@@ -645,7 +645,7 @@ jump_threader::simplify_control_stmt_condition_1
 void
 propagate_threaded_block_debug_into (basic_block dest, basic_block src)
 {
-  if (!flag_var_tracking_assignments)
+  if (!MAY_HAVE_DEBUG_BIND_STMTS)
     return;
 
   if (!single_pred_p (dest))

diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c
index ab5e91526e156dbfd08f3c1f486d4d0554561e42..1565e21d9832c8cb60909ce9cac5f525d9b8dd00 100644 (file)
--- a/gcc/tree-ssa.c
+++ b/gcc/tree-ssa.c
@@ -220,7 +220,7 @@ flush_pending_stmts (edge e)
 void
 gimple_replace_ssa_lhs (gimple *stmt, tree nlhs)
 {
-  if (flag_var_tracking_assignments)
+  if (MAY_HAVE_DEBUG_BIND_STMTS)
     {
       tree lhs = gimple_get_lhs (stmt);
 
@@ -242,7 +242,7 @@ gimple_replace_ssa_lhs (gimple *stmt, tree nlhs)
 tree
 target_for_debug_bind (tree var)
 {
-  if (!flag_var_tracking_assignments)
+  if (!MAY_HAVE_DEBUG_BIND_STMTS)
     return NULL_TREE;
 
   if (TREE_CODE (var) == SSA_NAME)
@@ -307,7 +307,7 @@ insert_debug_temp_for_var_def (gimple_stmt_iterator *gsi, tree var)
   int usecount = 0;
   tree value = NULL;
 
-  if (!flag_var_tracking_assignments)
+  if (!MAY_HAVE_DEBUG_BIND_STMTS)
     return;
 
   /* If this name has already been registered for replacement, do nothing
@@ -499,7 +499,7 @@ insert_debug_temps_for_defs (gimple_stmt_iterator *gsi)
   ssa_op_iter op_iter;
   def_operand_p def_p;
 
-  if (!flag_var_tracking_assignments)
+  if (!MAY_HAVE_DEBUG_BIND_STMTS)
     return;
 
   stmt = gsi_stmt (*gsi);
@@ -525,7 +525,7 @@ reset_debug_uses (gimple *stmt)
   imm_use_iterator imm_iter;
   gimple *use_stmt;
 
-  if (!flag_var_tracking_assignments)
+  if (!MAY_HAVE_DEBUG_BIND_STMTS)
     return;
 
   FOR_EACH_PHI_OR_STMT_DEF (def_p, stmt, op_iter, SSA_OP_DEF)

diff --git a/gcc/tree-ssanames.c b/gcc/tree-ssanames.c
index eceb51a08ac8655b4c39865675861b14de2815ec..f427c5a789b2879073bd84c92f080a41b116569b 100644 (file)
--- a/gcc/tree-ssanames.c
+++ b/gcc/tree-ssanames.c
@@ -560,7 +560,7 @@ release_ssa_name_fn (struct function *fn, tree var)
       int saved_ssa_name_version = SSA_NAME_VERSION (var);
       use_operand_p imm = &(SSA_NAME_IMM_USE_NODE (var));
 
-      if (flag_var_tracking_assignments)
+      if (MAY_HAVE_DEBUG_BIND_STMTS)
        insert_debug_temp_for_var_def (NULL, var);
 
       if (flag_checking)

diff --git a/gcc/tree-vect-loop-manip.c b/gcc/tree-vect-loop-manip.c
index 6d132553b06339f6bcfde1a0b4eb0fb56b6b34dc..f788deb3d72ccf93ddf48d42b4db4809af52c06b 100644 (file)
--- a/gcc/tree-vect-loop-manip.c
+++ b/gcc/tree-vect-loop-manip.c
@@ -201,7 +201,7 @@ adjust_debug_stmts_now (adjust_info *ai)
 static void
 adjust_vec_debug_stmts (void)
 {
-  if (!flag_var_tracking_assignments)
+  if (!MAY_HAVE_DEBUG_BIND_STMTS)
     return;
 
   gcc_assert (adjust_vec.exists ());
@@ -223,7 +223,7 @@ adjust_debug_stmts (tree from, tree to, basic_block bb)
 {
   adjust_info ai;
 
-  if (flag_var_tracking_assignments
+  if (MAY_HAVE_DEBUG_BIND_STMTS
       && TREE_CODE (from) == SSA_NAME
       && ! SSA_NAME_IS_DEFAULT_DEF (from)
       && ! virtual_operand_p (from))
@@ -251,7 +251,7 @@ adjust_phi_and_debug_stmts (gimple *update_phi, edge e, tree new_def)
 
   SET_PHI_ARG_DEF (update_phi, e->dest_idx, new_def);
 
-  if (flag_var_tracking_assignments)
+  if (MAY_HAVE_DEBUG_BIND_STMTS)
     adjust_debug_stmts (orig_def, PHI_RESULT (update_phi),
                        gimple_bb (update_phi));
 }
@@ -2696,7 +2696,7 @@ vect_do_peeling (loop_vec_info loop_vinfo, tree niters, tree nitersm1,
       vop_to_rename = create_lcssa_for_virtual_phi (orig_loop);
     }
 
-  if (flag_var_tracking_assignments)
+  if (MAY_HAVE_DEBUG_BIND_STMTS)
     {
       gcc_assert (!adjust_vec.exists ());
       adjust_vec.create (32);

diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c
index f305d545c9a610729c03c3ab9b2f5af78f348d9c..73efdb96badf151e7ace9826e49dd4cee97ba40e 100644 (file)
--- a/gcc/tree-vect-loop.c
+++ b/gcc/tree-vect-loop.c
@@ -9228,7 +9228,7 @@ vect_transform_loop_stmt (loop_vec_info loop_vinfo, stmt_vec_info stmt_info,
     dump_printf_loc (MSG_NOTE, vect_location,
                     "------>vectorizing statement: %G", stmt_info->stmt);
 
-  if (flag_var_tracking_assignments && !STMT_VINFO_LIVE_P (stmt_info))
+  if (MAY_HAVE_DEBUG_BIND_STMTS && !STMT_VINFO_LIVE_P (stmt_info))
     vect_loop_kill_debug_uses (loop, stmt_info);
 
   if (!STMT_VINFO_RELEVANT_P (stmt_info)
@@ -9602,7 +9602,7 @@ vect_transform_loop (loop_vec_info loop_vinfo, gimple *loop_vectorized_call)
          if (!stmt_info)
            continue;
 
-         if (flag_var_tracking_assignments && !STMT_VINFO_LIVE_P (stmt_info))
+         if (MAY_HAVE_DEBUG_BIND_STMTS && !STMT_VINFO_LIVE_P (stmt_info))
            vect_loop_kill_debug_uses (loop, stmt_info);
 
          if (!STMT_VINFO_RELEVANT_P (stmt_info)

diff --git a/gcc/tree.h b/gcc/tree.h
index 76d96c3dc765e63e5c867b0a85fd98ad57c5d89a..03719b18c67544e6ced68e6c9beb533b47ee0fb4 100644 (file)
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -1174,9 +1174,14 @@ extern void omp_clause_range_check_failed (const_tree, const char *, int,
 #define VL_EXP_OPERAND_LENGTH(NODE) \
   ((int)TREE_INT_CST_LOW (VL_EXP_CHECK (NODE)->exp.operands[0]))
 
+/* Nonzero if gimple_debug_nonbind_marker_p() may possibly hold.  */
+#define MAY_HAVE_DEBUG_MARKER_STMTS debug_nonbind_markers_p
+/* Nonzero if gimple_debug_bind_p() (and thus
+   gimple_debug_source_bind_p()) may possibly hold.  */
+#define MAY_HAVE_DEBUG_BIND_STMTS flag_var_tracking_assignments
 /* Nonzero if is_gimple_debug() may possibly hold.  */
 #define MAY_HAVE_DEBUG_STMTS                                   \
-  (debug_nonbind_markers_p || flag_var_tracking_assignments)
+  (MAY_HAVE_DEBUG_MARKER_STMTS || MAY_HAVE_DEBUG_BIND_STMTS)
 
 /* In a LOOP_EXPR node.  */
 #define LOOP_EXPR_BODY(NODE) TREE_OPERAND_CHECK_CODE (NODE, LOOP_EXPR, 0)