c-lex.c (cb_file_change): Pass the #inclusion's line number to the start_source_file...

* c-lex.c (cb_file_change): Pass the #inclusion's line number to
the start_source_file debug hook, not the current line number.

From-SVN: r51064

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9f9cdde..82f99cd 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-19  Jim Blandy  <jimb@redhat.com>
+
+       * c-lex.c (cb_file_change): Pass the #inclusion's line number to
+       the start_source_file debug hook, not the current line number.
+
 2002-03-19  Richard Henderson  <rth@redhat.com>
 
        * flow.c (EH_USES): Provide default.

diff --git a/gcc/c-lex.c b/gcc/c-lex.c
index 7bafde7..cf5141b 100644 (file)
--- a/gcc/c-lex.c
+++ b/gcc/c-lex.c
@@ -273,10 +273,12 @@ cb_file_change (pfile, new_map)
        main_input_filename = new_map->to_file;
       else
        {
-         lineno = SOURCE_LINE (new_map - 1, new_map->from_line - 1);
+          int included_at = SOURCE_LINE (new_map - 1, new_map->from_line - 1);
+
+         lineno = included_at;
          push_srcloc (new_map->to_file, 1);
          input_file_stack->indent_level = indent_level;
-         (*debug_hooks->start_source_file) (lineno, new_map->to_file);
+         (*debug_hooks->start_source_file) (included_at, new_map->to_file);
 #ifndef NO_IMPLICIT_EXTERN_C
          if (c_header_level)
            ++c_header_level;