[PATCH 10/12] mode-switching: Use 1-based edge aux fields

[Richard Sandiford]

The pass used the edge aux field to record which mode change
should happen on the edge, with -1 meaning "none".  It's more
convenient for later patches to leave aux zero for "none",
and use numbers based at 1 to record a change.

gcc/
        * mode-switching.cc (commit_mode_sets): Use 1-based edge aux values.
---
 gcc/mode-switching.cc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gcc/mode-switching.cc b/gcc/mode-switching.cc
index 7a5c4993d65..1815b397dd0 100644
--- a/gcc/mode-switching.cc
+++ b/gcc/mode-switching.cc
@@ -106,10 +106,10 @@ commit_mode_sets (struct edge_list *edge_list, int e, 
struct bb_info *info)
   for (int ed = NUM_EDGES (edge_list) - 1; ed >= 0; ed--)
     {
       edge eg = INDEX_EDGE (edge_list, ed);
-      int mode;
 
-      if ((mode = (int)(intptr_t)(eg->aux)) != -1)
+      if (eg->aux)
        {
+         int mode = (int) (intptr_t) eg->aux - 1;
          HARD_REG_SET live_at_edge;
          basic_block src_bb = eg->src;
          int cur_mode = info[src_bb->index].mode_out;
@@ -728,14 +728,12 @@ optimize_mode_switching (void)
        {
          edge eg = INDEX_EDGE (edge_list, ed);
 
-         eg->aux = (void *)(intptr_t)-1;
-
          for (i = 0; i < no_mode; i++)
            {
              int m = targetm.mode_switching.priority (entity_map[j], i);
              if (mode_bit_p (insert[ed], j, m))
                {
-                 eg->aux = (void *)(intptr_t)m;
+                 eg->aux = (void *) (intptr_t) (m + 1);
                  break;
                }
            }
-- 
2.25.1