* c-lex.c (fe_file_change): Don't transform to_line with SOURCE_LINE.

From-SVN: r71328

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index df66b3e..885a40f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-11  Mike Stump  <mrs@apple.com>
+
+       * c-lex.c (fe_file_change): Don't transform to_line with SOURCE_LINE.
+
 2003-09-11  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * builtins.c (fold_builtin_logarithm): if N can't be truncated to

diff --git a/gcc/c-lex.c b/gcc/c-lex.c
index 47515e7..c9c69a6 100644 (file)
--- a/gcc/c-lex.c
+++ b/gcc/c-lex.c
@@ -212,8 +212,6 @@ cb_dir_change (cpp_reader *pfile ATTRIBUTE_UNUSED, const char *dir)
 void
 fe_file_change (const struct line_map *new_map)
 {
-  unsigned int to_line = SOURCE_LINE (new_map, new_map->to_line);
-
   if (new_map->reason == LC_ENTER)
     {
       /* Don't stack the main buffer on the input stack;
@@ -250,13 +248,13 @@ fe_file_change (const struct line_map *new_map)
 #endif
       pop_srcloc ();
 
-      (*debug_hooks->end_source_file) (to_line);
+      (*debug_hooks->end_source_file) (new_map->to_line);
     }
 
   update_header_times (new_map->to_file);
   in_system_header = new_map->sysp != 0;
   input_filename = new_map->to_file;
-  input_line = to_line;
+  input_line = new_map->to_line;
   map = new_map;
 
   /* Hook for C++.  */