tree-ssa-live.c (create_ssa_var_map): Avoid defined-but-not-used variables due to...

        * tree-ssa-live.c (create_ssa_var_map): Avoid defined-but-not-used
        variables due to conditional compilation.

From-SVN: r85053

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2b38a13387cf0c5b60a104a64ecf73a7fc89747d..3c7cc552fd217512fde083f89dc8f47c428ecbb1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-22  Richard Henderson  <rth@redhat.com>
+
+       * tree-ssa-live.c (create_ssa_var_map): Avoid defined-but-not-used
+       variables due to conditional compilation.
+
 2004-07-22  Diego Novillo  <dnovillo@redhat.com>
 
        * tree-into-ssa.c (set_livein_block): Fix typo in comment.

diff --git a/gcc/tree-ssa-live.c b/gcc/tree-ssa-live.c
index 6d006fa99fbd0a27b22d6cf25de615f9049dbd85..45df501ee1b5a3826b5c9e77b7062191b22821ac 100644 (file)
--- a/gcc/tree-ssa-live.c
+++ b/gcc/tree-ssa-live.c
@@ -325,21 +325,21 @@ create_ssa_var_map (int flags)
   tree dest, use;
   tree stmt;
   stmt_ann_t ann;
-  vuse_optype vuses;
-  v_may_def_optype v_may_defs;
-  v_must_def_optype v_must_defs;
   use_optype uses;
   def_optype defs;
   unsigned x;
   var_map map;
-#if defined ENABLE_CHECKING
+#ifdef ENABLE_CHECKING
   sbitmap used_in_real_ops;
   sbitmap used_in_virtual_ops;
+  vuse_optype vuses;
+  v_may_def_optype v_may_defs;
+  v_must_def_optype v_must_defs;
 #endif
 
   map = init_var_map (num_ssa_names + 1);
 
-#if defined ENABLE_CHECKING
+#ifdef ENABLE_CHECKING
   used_in_real_ops = sbitmap_alloc (num_referenced_vars);
   sbitmap_zero (used_in_real_ops);
 
@@ -384,7 +384,7 @@ create_ssa_var_map (int flags)
              use = USE_OP (uses, x);
              register_ssa_partition (map, use, true);
 
-#if defined ENABLE_CHECKING
+#ifdef ENABLE_CHECKING
              SET_BIT (used_in_real_ops, var_ann (SSA_NAME_VAR (use))->uid);
 #endif
            }
@@ -395,40 +395,34 @@ create_ssa_var_map (int flags)
              dest = DEF_OP (defs, x);
              register_ssa_partition (map, dest, false);
 
-#if defined ENABLE_CHECKING
+#ifdef ENABLE_CHECKING
              SET_BIT (used_in_real_ops, var_ann (SSA_NAME_VAR (dest))->uid);
 #endif
            }
 
-         /* While we do not care about virtual operands for
-            out of SSA, we do need to look at them to make sure
-            we mark all the variables which are used.  */
+#ifdef ENABLE_CHECKING
+         /* Validate that virtual ops don't get used in funny ways.  */
          vuses = VUSE_OPS (ann);
          for (x = 0; x < NUM_VUSES (vuses); x++)
            {
              tree var = VUSE_OP (vuses, x);
-#if defined ENABLE_CHECKING
              SET_BIT (used_in_virtual_ops, var_ann (SSA_NAME_VAR (var))->uid);
-#endif
            }
 
          v_may_defs = V_MAY_DEF_OPS (ann);
          for (x = 0; x < NUM_V_MAY_DEFS (v_may_defs); x++)
            {
              tree var = V_MAY_DEF_OP (v_may_defs, x);
-#if defined ENABLE_CHECKING
              SET_BIT (used_in_virtual_ops, var_ann (SSA_NAME_VAR (var))->uid);
-#endif
            }
            
          v_must_defs = V_MUST_DEF_OPS (ann);
          for (x = 0; x < NUM_V_MUST_DEFS (v_must_defs); x++)
            {
              tree var = V_MUST_DEF_OP (v_must_defs, x);
-#if defined ENABLE_CHECKING
              SET_BIT (used_in_virtual_ops, var_ann (SSA_NAME_VAR (var))->uid);
-#endif
            }       
+#endif /* ENABLE_CHECKING */
 
          mark_all_vars_used (bsi_stmt_ptr (bsi));
        }