From f78ce0b72f5df10408865142b003e7ed13cecd2c Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Wed, 20 Mar 2002 05:06:51 +0000 Subject: [PATCH] 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 --- gcc/ChangeLog | 5 +++++ gcc/c-lex.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9f9cddefa8d..82f99cd2bda 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2002-03-19 Jim Blandy + + * 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 * flow.c (EH_USES): Provide default. diff --git a/gcc/c-lex.c b/gcc/c-lex.c index 7bafde752de..cf5141bea2e 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; -- 2.30.2