genoutput.c:next_index_number is only used to set a structure field that
itself is never used.  I think this dates from before the recent fad for
including filenames and line numbers in error messages.

Series bootstrapped & regression-tested on x86_64-linux-gnu.  I built gcc
before and after the series for one target per CPU directory and checked
that the output was the same (except for some filename fixes later in
the series.)  Applied.

Thanks,
Richard


gcc/
        * genoutput.c (next_index_number): Delete.
        (data): Remove index_number.
        (gen_insn, gen_peephole, gen_expand, gen_split): Update accordingly.
        (main): Remove manipulation of next_index_number.

Index: gcc/genoutput.c
===================================================================
--- gcc/genoutput.c     2015-07-16 14:17:16.423685516 +0100
+++ gcc/genoutput.c     2015-07-16 14:17:16.419685729 +0100
@@ -109,11 +109,6 @@ static const char *strip_whitespace        (con
 
 static int next_code_number;
 
-/* This counts all definitions in the md file,
-   for the sake of error messages.  */
-
-static int next_index_number;
-
 /* This counts all operands used in the md file.  The first is null.  */
 
 static int next_operand_number = 1;
@@ -160,7 +155,6 @@ struct data
   const char *name;
   const char *template_code;
   int code_number;
-  int index_number;
   const char *filename;
   int lineno;
   int n_generator_args;                /* Number of arguments passed to 
generator */
@@ -885,7 +879,6 @@ gen_insn (rtx insn, int lineno)
   int i;
 
   d->code_number = next_code_number;
-  d->index_number = next_index_number;
   d->filename = read_md_filename;
   d->lineno = lineno;
   if (XSTR (insn, 0)[0])
@@ -928,7 +921,6 @@ gen_peephole (rtx peep, int lineno)
   int i;
 
   d->code_number = next_code_number;
-  d->index_number = next_index_number;
   d->filename = read_md_filename;
   d->lineno = lineno;
   d->name = 0;
@@ -968,7 +960,6 @@ gen_expand (rtx insn, int lineno)
   int i;
 
   d->code_number = next_code_number;
-  d->index_number = next_index_number;
   d->filename = read_md_filename;
   d->lineno = lineno;
   if (XSTR (insn, 0)[0])
@@ -1014,7 +1005,6 @@ gen_split (rtx split, int lineno)
   int i;
 
   d->code_number = next_code_number;
-  d->index_number = next_index_number;
   d->filename = read_md_filename;
   d->lineno = lineno;
   d->name = 0;
@@ -1067,7 +1057,6 @@ main (int argc, char **argv)
     return (FATAL_EXIT_CODE);
 
   output_prologue ();
-  next_index_number = 0;
 
   /* Read the machine description.  */
 
@@ -1108,7 +1097,6 @@ main (int argc, char **argv)
        default:
          break;
        }
-      next_index_number++;
     }
 
   printf ("\n\n");

Reply via email to