* c-lex.c (yyparse): Call debug_hooks->start_source_file for

	the primary source file; this has not been done yet.
	* c-decl.c (c_expand_body): Reset input_filename from
	DECL_SOURCE_FILE (fndecl) before calling init_function_start.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49383 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 25 insertions, 14 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 158f01932d8..bd2aa0d022b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-31  Zack Weinberg  <zack@codesourcery.com>
+
+	* c-lex.c (yyparse): Call debug_hooks->start_source_file for
+	the primary source file; this has not been done yet.
+	* c-decl.c (c_expand_body): Reset input_filename from
+	DECL_SOURCE_FILE (fndecl) before calling init_function_start.
+
 2002-01-31  Kazu Hirata  <kazu@hxi.com>
 
 	* rtlanal.c (subreg_regno_offset): Do not use
@@ -76,13 +83,13 @@
 
 2002-01-29  Aldy Hernandez  <aldyh@redhat.com>
 
-        * rs6000.md ("*call_value_local32"): Remove constraints.
-        ("*call_value_local64"): Same.
-        ("*call_value_indirect_nonlocal_aix32"): Same.
-        ("*call_value_nonlocal_aix32"): Same.
-        ("*call_value_indirect_nonlocal_aix64"): Same.
-        ("*call_value_nonlocal_aix64"): Same.
-        ("*call_value_nonlocal_sysv"): Same.
+	* rs6000.md ("*call_value_local32"): Remove constraints.
+	("*call_value_local64"): Same.
+	("*call_value_indirect_nonlocal_aix32"): Same.
+	("*call_value_nonlocal_aix32"): Same.
+	("*call_value_indirect_nonlocal_aix64"): Same.
+	("*call_value_nonlocal_aix64"): Same.
+	("*call_value_nonlocal_sysv"): Same.
 
 2002-01-29  Richard Henderson  <rth@redhat.com>
 
@@ -114,18 +121,18 @@
 
 2002-01-29  Neil Booth  <neil@daikokuya.demon.co.uk>
 
-        * tree.c (build_nonstandard_integer_type): Correct prototype.
+	* tree.c (build_nonstandard_integer_type): Correct prototype.
 
 2002-01-29  Ulrich Weigand  <uweigand@de.ibm.com>
 
-	* config/s390/s390.md (movstrsico, movstrdix_64, 
+	* config/s390/s390.md (movstrsico, movstrdix_64,
 	movstrsix_31): Remove, replace by ...
-	(movstrdi_short, movstrsi_short, movstrdi_long, 
+	(movstrdi_short, movstrsi_short, movstrdi_long,
 	movstrsi_long): ... these.  New.
 	(movstrdi, movstrsi): Adapt.
 
 	(rotldi3, rotlsi3, ashldi3, *ashldi3_31, *ashldi3_64,
-	ashlsi3, lshrdi3, *lshrdi3_31, *lshrdi3_64, lshrsi3): 
+	ashlsi3, lshrdi3, *lshrdi3_31, *lshrdi3_64, lshrsi3):
 	Remove unnecessary CC clobber.
 	(*ashrdi3_cc_31, *ashrdi3_cconly_31, *ashrdi3_cc_64,
 	*ashrdi3_cconly_64, *ashrsi3_cc, *ashrsi3_cconly): New.
@@ -157,7 +164,7 @@
 	grokdeclarator.
 	(build_bitfield_integer_type): New function.
 	(finish_struct): Move bitfield validation to grokdeclarator
-	and build_bitfield_integer_type. 
+	and build_bitfield_integer_type.
 	* tree.c (build_nonstandard_integer_type): New function.
 	* tree.h (build_nonstandard_integer_type): New prototype.
 objc:
@@ -542,7 +549,7 @@ Fri Jan 25 20:43:56 CET 2002  Jan Hubicka  <jh@suse.cz>
 
 2002-01-14  Hartmut Penner  <hpenner@de.ibm.com>
 
-	* emit_rtl.c (gen_lowpart_common): Conversion from const_int 
+	* emit_rtl.c (gen_lowpart_common): Conversion from const_int
 	to const_double needs to be done right for big-endian systems.
 
 2002-01-24  Jason Merrill  <jason@redhat.com>
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 9deb193dae0..4153f50e808 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -7014,6 +7014,7 @@ c_expand_body (fndecl, nested_p, can_defer_p)
 
   /* Initialize the RTL code for the function.  */
   current_function_decl = fndecl;
+  input_filename = DECL_SOURCE_FILE (fndecl);
   init_function_start (fndecl, input_filename, DECL_SOURCE_LINE (fndecl));
 
   /* This function is being processed in whole-function mode.  */
diff --git a/gcc/c-lex.c b/gcc/c-lex.c
index fe08f417b9e..a0d2bbdf2fd 100644
--- a/gcc/c-lex.c
+++ b/gcc/c-lex.c
@@ -150,11 +150,14 @@ init_c_lex (filename)
 }
 
 /* A thin wrapper around the real parser that initializes the 
-   integrated preprocessor after debug output has been initialized.  */
+   integrated preprocessor after debug output has been initialized.
+   Also, make sure the start_source_file debug hook gets called for
+   the primary source file.  */
 
 int
 yyparse()
 {
+  (*debug_hooks->start_source_file) (lineno, input_filename);
   cpp_finish_options (parse_in);
 
   return yyparse_1();