aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Blandy <jimb@redhat.com>2002-03-20 05:06:51 +0000
committerJim Blandy <jimb@gcc.gnu.org>2002-03-20 05:06:51 +0000
commitf78ce0b72f5df10408865142b003e7ed13cecd2c (patch)
treedd705264a3fc3f7af36e47445802c7c74414429a
parent0c2fdcdf7f583bc7061428813c01b7824f563349 (diff)
downloadgcc-f78ce0b72f5df10408865142b003e7ed13cecd2c.zip
gcc-f78ce0b72f5df10408865142b003e7ed13cecd2c.tar.gz
gcc-f78ce0b72f5df10408865142b003e7ed13cecd2c.tar.bz2
c-lex.c (cb_file_change): Pass the #inclusion's line number to the start_source_file debug hook...
* 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
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/c-lex.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9f9cdde..82f99cd 100644
--- 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
--- 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;