* rtl.h (emit_line_note): Take a location_t.

	(emit_line_note_force): Remove.
	(set_file_and_line_for_statement): Take a location_t.
	* tree.g (emit_line_note): Take a location_t.
	* emit-rtl.c (emit_line_note): Take a location_t.
	(emit_line_note_force): Remove.
	* function.c (init_function_start): Adjust emit_line_note call.
	(expand_function_end): Use force_next_line_note, not
	emit_line_note_force.
	* c-parse.in (maybe_type_qual): Adjust emit_line_note calls.
	* c-semantics.c (genrtl_do_pushlevel, genrtl_goto_stmt,
	genrtl_expr_stmt_value, genrtl_decl_stmt, genrtl_if_stmt,
	genrtl_while_stmt, genrtl_do_stmt_1, genrtl_return_stmt,
	genrtl_for_stmt, genrtl_break_stmt, genrtl_continue_stmt,
	genrtl_continue_stmt, genrtl_switch_stmt,
	genrtl_asm_stmt): Likewise.
	* expr.c (expand_expr): Likewise.
	* integrate.c (expand_inline_function): Likewise.
	* stmt.c (set_file_and_line_for_stmt): Take a location_t.
	(expand_decl_init): Adjust emit_line_note call.

	* ada/trans.c (build_unit_elab, set_lineno): Adjust emit_line_note
	calls.

	* cp/semantics.c: (genrtl_try_block) Adjust emit_line_note
	calls.

	* f/com.c (bison_rule_pushlevel_, bison_rule_compstmt_): Adjust
	emit_line_note calls.
	* f/ste.c (ffeste_emit_line_note_): Likewise.

	* java/expr.c (expand_byte_code):

	* treelang/treetree.c (tree_code_if_start, tree_code_if_else,
	tree_code_if_end, tree_code_create_function_initial,
	tree_code_create_function_wrapup, tree_code_generate_return,
	tree_code_output_expression_statement): Adjust emit_line_note
	calls.


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

2 files changed, 15 insertions, 8 deletions

diff --git a/gcc/treelang/ChangeLog b/gcc/treelang/ChangeLog
index 7031e6e4253..2569137a0e2 100644
--- a/gcc/treelang/ChangeLog
+++ b/gcc/treelang/ChangeLog
@@ -1,3 +1,11 @@
+2003-07-07  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* treelang/treetree.c (tree_code_if_start, tree_code_if_else,
+	tree_code_if_end, tree_code_create_function_initial,
+	tree_code_create_function_wrapup, tree_code_generate_return,
+	tree_code_output_expression_statement): Adjust emit_line_note
+	calls.
+
 2003-07-04  H.J. Lu <hongjiu.lu@intel.com>
 
 	* Make-lang.in: Replace PWD with PWD_COMMAND.
diff --git a/gcc/treelang/treetree.c b/gcc/treelang/treetree.c
index 57a4a48fbfd..c752a82f1c2 100644
--- a/gcc/treelang/treetree.c
+++ b/gcc/treelang/treetree.c
@@ -189,7 +189,7 @@ tree_code_if_start (tree exp, location_t loc)
                  TREE_TYPE (exp),
                  exp,
                  build1 (CONVERT_EXPR, TREE_TYPE (exp), integer_zero_node));
-  emit_line_note (loc.file, loc.line); /* Output the line number information.  */
+  emit_line_note (loc); /* Output the line number information.  */
   expand_start_cond (cond_exp, /* Exit-able if nonzero.  */ 0);
 }
 
@@ -199,7 +199,7 @@ tree_code_if_start (tree exp, location_t loc)
 void
 tree_code_if_else (location_t loc)
 {
-  emit_line_note (loc.file, loc.line); /* Output the line number information.  */
+  emit_line_note (loc); /* Output the line number information.  */
   expand_start_else ();
 }
 
@@ -209,7 +209,7 @@ tree_code_if_else (location_t loc)
 void
 tree_code_if_end (location_t loc)
 {
-  emit_line_note (loc.file, loc.line); /* Output the line number information.  */
+  emit_line_note (loc); /* Output the line number information.  */
   expand_end_cond ();
 }
 
@@ -428,7 +428,7 @@ tree_code_create_function_initial (tree prev_saved,
 
   expand_start_bindings (0);
 
-  emit_line_note (loc.file, loc.line); /* Output the line number information.  */
+  emit_line_note (loc); /* Output the line number information.  */
 }
 
 /* Wrapup a function contained in file FILENAME, ending at line LINENO.  */
@@ -440,7 +440,7 @@ tree_code_create_function_wrapup (location_t loc)
 
   fn_decl = current_function_decl;
 
-  emit_line_note (loc.file, loc.line); /* Output the line number information.  */
+  emit_line_note (loc); /* Output the line number information.  */
 
   /* Get completely built level from debugger symbol table.  */
 
@@ -602,11 +602,10 @@ tree_code_generate_return (tree type, tree exp)
 
 
 void
-tree_code_output_expression_statement (tree code,
-                                       location_t loc)
+tree_code_output_expression_statement (tree code, location_t loc)
 {
   /* Output the line number information.  */
-  emit_line_note (loc.file, loc.line);
+  emit_line_note (loc);
   TREE_USED (code) = 1;
   TREE_SIDE_EFFECTS (code) = 1;
   expand_expr_stmt (code);