[gcc] GCC 4.5.0=>4.5.1

gcc/libcpp/line-map.c

 /* Map logical line numbers to (source file, line number) pairs.
    Copyright (C) 2001, 2003, 2004, 2007, 2008, 2009
    Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
 Free Software Foundation; either version 3, or (at your option) any
 later version.
 
 This program is distributed in the hope that it will be useful,
@@ skipping 20 matching lines @@
 void
 linemap_init (struct line_maps *set)
 {
   set->maps = NULL;
   set->allocated = 0;
   set->used = 0;
   set->last_listed = -1;
   set->trace_includes = false;
   set->depth = 0;
   set->cache = 0;
-  set->highest_location = 0;
-  set->highest_line = 0;
+  set->highest_location = RESERVED_LOCATION_COUNT - 1;
+  set->highest_line = RESERVED_LOCATION_COUNT - 1;
   set->max_column_hint = 0;
+  set->reallocator = 0;
 }
 
 /* Check for and warn about line_maps entered but not exited.  */
 
 void
 linemap_check_files_exited (struct line_maps *set)
 {
   struct line_map *map;
   /* Depending upon whether we are handling preprocessed input or
      not, this can be a user error or an ICE.  */
@@ skipping 47 matching lines @@
       set->maps
         = (struct line_map *) (*reallocator) (set->maps,
                                               set->allocated
                                               * sizeof (struct line_map));
       memset (&set->maps[set->used], 0, ((set->allocated - set->used)
                                          * sizeof (struct line_map)));
     }
 
   map = &set->maps[set->used];
 
-  if (to_file && *to_file == '\0')
+  if (to_file && *to_file == '\0' && reason != LC_RENAME_VERBATIM)
     to_file = "<stdin>";
 
+  if (reason == LC_RENAME_VERBATIM)
+    reason = LC_RENAME;
+
   /* If we don't keep our line maps consistent, we can easily
      segfault.  Don't rely on the client to do it for us.  */
   if (set->depth == 0)
     reason = LC_ENTER;
   else if (reason == LC_LEAVE)
     {
       struct line_map *from;
       bool error;
 
       if (MAIN_FILE_P (map - 1))
@@ skipping 171 matching lines @@
       if (set->maps[md].start_location > line)
         mx = md;
       else
         mn = md;
     }
 
   set->cache = mn;
   return &set->maps[mn];
 }
 
-/* Print the file names and line numbers of the #include commands
-   which led to the map MAP, if any, to stderr.  Nothing is output if
-   the most recently listed stack is the same as the current one.  */
-
-void
-linemap_print_containing_files (struct line_maps *set,
-                                const struct line_map *map)
-{
-  if (MAIN_FILE_P (map) || set->last_listed == map->included_from)
-    return;
-
-  set->last_listed = map->included_from;
-  map = INCLUDED_FROM (set, map);
-
-  fprintf (stderr,  _("In file included from %s:%u"),
-           map->to_file, LAST_SOURCE_LINE (map));
-
-  while (! MAIN_FILE_P (map))
-    {
-      map = INCLUDED_FROM (set, map);
-      /* Translators note: this message is used in conjunction
-         with "In file included from %s:%ld" and some other
-         tricks.  We want something like this:
-
-         | In file included from sys/select.h:123,
-         |                  from sys/types.h:234,
-         |                  from userfile.c:31:
-         | bits/select.h:45: <error message here>
-
-         with all the "from"s lined up.
-         The trailing comma is at the beginning of this message,
-         and the trailing colon is not translated.  */
-      fprintf (stderr, _(",\n                 from %s:%u"),
-               map->to_file, LAST_SOURCE_LINE (map));
-    }
-
-  fputs (":\n", stderr);
-}
-
 /* Print an include trace, for e.g. the -H option of the preprocessor.  */
 
 static void
 trace_include (const struct line_maps *set, const struct line_map *map)
 {
   unsigned int i = set->depth;
 
   while (--i)
     putc ('.', stderr);
   fprintf (stderr, " %s\n", map->to_file);
 }