* tree.h (init_function_start): Remove filename and line paramters.

	* function.c (init_function_start): Remove filename and line
	parameters. Use DECL_SOURCE_LOCATION.
	* c-decl.c (store_parm_decls): Adjust init_function_start call.
	(c_expand_body_1): Likewise.
	* coverage.c (create_coverage): Likewise.

	* ada/utils.c (begin_subprog_body): Adjust init_function_start
	call.

	* cp/decl.c (start_function): Adjust init_function_start call.
	* cp/method.c (use_thunk): Likewise.
	* cp/semantics.c (genrtl_start_function): Likewise.

	* f/com.c (stor_parm_decls): Adjust init_function_start call.

	* java/class.c (emit_register_classes): Adjust init_function_start
	call.
	* java/decl.c (complete_start_java_method): Likewise.
	* java/resource.c (write_resource_constructor): Likewise.

	* objc/objc-act.c (build_tmp_function_decl): Set line number to
	zero.
	(hack_method_prototype): Adjust init_function_start call.

	* treelang/treetree.c (tree_code_create_function_initial): Adjust
	init_function_start call.


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

4 files changed, 12 insertions, 3 deletions

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 88bc7fe44dd..0fdaa9dd890 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,10 @@
+2003-06-14  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* class.c (emit_register_classes): Adjust init_function_start
+	call.
+	* decl.c (complete_start_java_method): Likewise.
+	* resource.c (write_resource_constructor): Likewise.
+
 2003-06-14  Neil Booth  <neil@daikokuya.co.uk>
 
 	* Make-lang.in: Update to use options.c and options.h.
diff --git a/gcc/java/class.c b/gcc/java/class.c
index a7fa45442ef..fe00f78f9a3 100644
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -2003,6 +2003,7 @@ emit_register_classes (void)
       
       init_decl = build_decl (FUNCTION_DECL, init_name, init_type);
       SET_DECL_ASSEMBLER_NAME (init_decl, init_name);
+      DECL_SOURCE_LINE (init_decl) = 0;
       TREE_STATIC (init_decl) = 1;
       current_function_decl = init_decl;
       DECL_RESULT (init_decl) = build_decl (RESULT_DECL, NULL_TREE,
@@ -2017,7 +2018,7 @@ emit_register_classes (void)
 
       pushlevel (0);
       make_decl_rtl (init_decl, NULL);
-      init_function_start (init_decl, input_filename, 0);
+      init_function_start (init_decl);
       expand_function_start (init_decl, 0);
 
       /* Do not allow the function to be deferred.  */
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index b06cf88249b..7d5507cd8ed 100644
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -1670,7 +1670,7 @@ complete_start_java_method (tree fndecl)
   if (! flag_emit_class_files)
     {
       /* Initialize the RTL code for the function.  */
-      init_function_start (fndecl, input_filename, input_line);
+      init_function_start (fndecl);
 
       /* Set up parameters and prepare for return, for the function.  */
       expand_function_start (fndecl, 0);
diff --git a/gcc/java/resource.c b/gcc/java/resource.c
index 9e2b2434008..a1de225c608 100644
--- a/gcc/java/resource.c
+++ b/gcc/java/resource.c
@@ -113,6 +113,7 @@ write_resource_constructor (void)
   init_type = build_function_type (void_type_node, end_params_node);
 
   init_decl = build_decl (FUNCTION_DECL, init_name, init_type);
+  DECL_SOURCE_LINE (init_decl) = 0;
   SET_DECL_ASSEMBLER_NAME (init_decl, init_name);
   TREE_STATIC (init_decl) = 1;
   current_function_decl = init_decl;
@@ -125,7 +126,7 @@ write_resource_constructor (void)
 
   pushlevel (0);
   make_decl_rtl (init_decl, NULL);
-  init_function_start (init_decl, input_filename, 0);
+  init_function_start (init_decl);
   expand_function_start (init_decl, 0);
 
   /* Write out entries in the same order in which they were defined.  */