rtl.h (emit_line_note): Take a location_t.

	* 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.

From-SVN: r69047

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4d590fb16fd01b0f8139b13935feb7f9234ea0ee..f394dc3bed7f49f111406081932af4f939302c67 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,26 @@
+2003-07-07  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * 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.
+
 2003-07-07  Dale Johannesen  <dalej@apple.com>
 
         * config/rs6000/darwin-tramp.asm:  Fix trampolines.  PR 10900.

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 467111fa1c89123834fe0866d3aff059fd5bc340..cc2d36df7e01cabc61254a5dabde6f76a5efe705 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-07  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * trans.c (build_unit_elab, set_lineno): Adjust emit_line_note
+       calls.
+
 2003-07-06  Neil Booth  <neil@daikokuya.co.uk>
 
        * misc.c (gnat_handle_option): Don't handle filenames.

diff --git a/gcc/ada/trans.c b/gcc/ada/trans.c
index f3881d28c3481f17ed4ceacc92283e0023cdb1c0..8e6f9ac4e497c93ceb64154013cb8e358e427d42 100644 (file)
--- a/gcc/ada/trans.c
+++ b/gcc/ada/trans.c
@@ -5341,7 +5341,7 @@ build_unit_elab (gnat_unit, body_p, gnu_elab_list)
            && TYPE_IS_PADDING_P (TREE_TYPE (lhs)))
          lhs = convert (TREE_TYPE (TYPE_FIELDS (TREE_TYPE (lhs))), lhs);
 
-       emit_line_note (input_filename, input_line);
+       emit_line_note (input_location);
        expand_expr_stmt (build_binary_op (MODIFY_EXPR, NULL_TREE,
                                           TREE_PURPOSE (gnu_elab_list),
                                           TREE_VALUE (gnu_elab_list)));
@@ -5407,7 +5407,7 @@ set_lineno (gnat_node, write_note_p)
   input_line = Get_Logical_Line_Number (source_location);
 
   if (write_note_p)
-    emit_line_note (input_filename, input_line);
+    emit_line_note (input_location);
 }
 \f
 /* Post an error message.  MSG is the error message, properly annotated.

diff --git a/gcc/c-parse.in b/gcc/c-parse.in
index bcfb0248c3a0b88a3b6a4281ec3b2f9bd00192ed..787167c155d628f7b53161bd035bef42277d4179 100644 (file)
--- a/gcc/c-parse.in
+++ b/gcc/c-parse.in
@@ -2444,10 +2444,10 @@ label:    CASE expr_no_commas ':'
 
 maybe_type_qual:
        /* empty */
-               { emit_line_note (input_filename, input_line);
+               { emit_line_note (input_location);
                  $$ = NULL_TREE; }
        | TYPE_QUAL
-               { emit_line_note (input_filename, input_line); }
+               { emit_line_note (input_location); }
        ;
 
 xexpr:

diff --git a/gcc/c-semantics.c b/gcc/c-semantics.c
index 4e27bec22b27f01d267def14e49e57f4e45f09ad..1481e1db706255a5eabc13046866f11c948b8a54 100644 (file)
--- a/gcc/c-semantics.c
+++ b/gcc/c-semantics.c
@@ -300,7 +300,7 @@ emit_local_var (tree decl)
 void
 genrtl_do_pushlevel (void)
 {
-  emit_line_note (input_filename, input_line);
+  emit_line_note (input_location);
   clear_last_expr ();
 }
 
@@ -317,7 +317,7 @@ genrtl_goto_stmt (tree destination)
   if (TREE_CODE (destination) == LABEL_DECL)
     TREE_USED (destination) = 1;
 
-  emit_line_note (input_filename, input_line);
+  emit_line_note (input_location);
 
   if (TREE_CODE (destination) == LABEL_DECL)
     {
@@ -350,7 +350,7 @@ genrtl_expr_stmt_value (tree expr, int want_value, int maybe_last)
 {
   if (expr != NULL_TREE)
     {
-      emit_line_note (input_filename, input_line);
+      emit_line_note (input_location);
 
       if (stmts_are_full_exprs_p ())
        expand_start_target_temps ();
@@ -369,7 +369,7 @@ void
 genrtl_decl_stmt (tree t)
 {
   tree decl;
-  emit_line_note (input_filename, input_line);
+  emit_line_note (input_location);
   decl = DECL_STMT_DECL (t);
   /* If this is a declaration for an automatic local
      variable, initialize it.  Note that we might also see a
@@ -405,7 +405,7 @@ genrtl_if_stmt (tree t)
   tree cond;
   genrtl_do_pushlevel ();
   cond = expand_cond (IF_COND (t));
-  emit_line_note (input_filename, input_line);
+  emit_line_note (input_location);
   expand_start_cond (cond, 0);
   if (THEN_CLAUSE (t))
     {
@@ -435,14 +435,14 @@ genrtl_while_stmt (tree t)
   tree cond = WHILE_COND (t);
 
   emit_nop ();
-  emit_line_note (input_filename, input_line);
+  emit_line_note (input_location);
   expand_start_loop (1);
   genrtl_do_pushlevel ();
 
   if (cond && !integer_nonzerop (cond))
     {
       cond = expand_cond (cond);
-      emit_line_note (input_filename, input_line);
+      emit_line_note (input_location);
       expand_exit_loop_top_cond (0, cond);
       genrtl_do_pushlevel ();
     }
@@ -472,25 +472,25 @@ genrtl_do_stmt_1 (tree cond, tree body)
   else if (integer_nonzerop (cond))
     {
       emit_nop ();
-      emit_line_note (input_filename, input_line);
+      emit_line_note (input_location);
       expand_start_loop (1);
 
       expand_stmt (body);
 
-      emit_line_note (input_filename, input_line);
+      emit_line_note (input_location);
       expand_end_loop ();
     }
   else
     {
       emit_nop ();
-      emit_line_note (input_filename, input_line);
+      emit_line_note (input_location);
       expand_start_loop_continue_elsewhere (1);
 
       expand_stmt (body);
 
       expand_loop_continue_here ();
       cond = expand_cond (cond);
-      emit_line_note (input_filename, input_line);
+      emit_line_note (input_location);
       expand_exit_loop_if_false (0, cond);
       expand_end_loop ();
     }
@@ -521,7 +521,7 @@ genrtl_return_stmt (tree stmt)
 
   expr = RETURN_STMT_EXPR (stmt);
 
-  emit_line_note (input_filename, input_line);
+  emit_line_note (input_location);
   if (!expr)
     expand_null_return ();
   else
@@ -547,7 +547,7 @@ genrtl_for_stmt (tree t)
 
   /* Expand the initialization.  */
   emit_nop ();
-  emit_line_note (input_filename, input_line);
+  emit_line_note (input_location);
   if (FOR_EXPR (t))
     expand_start_loop_continue_elsewhere (1);
   else
@@ -562,7 +562,7 @@ genrtl_for_stmt (tree t)
   if (cond && !integer_nonzerop (cond))
     {
       cond = expand_cond (cond);
-      emit_line_note (input_filename, input_line);
+      emit_line_note (input_location);
       expand_exit_loop_top_cond (0, cond);
       genrtl_do_pushlevel ();
     }
@@ -572,7 +572,7 @@ genrtl_for_stmt (tree t)
 
   /* Expand the increment expression.  */
   input_location = saved_loc;
-  emit_line_note (input_filename, input_line);
+  emit_line_note (input_location);
   if (FOR_EXPR (t))
     {
       expand_loop_continue_here ();
@@ -594,7 +594,7 @@ build_break_stmt (void)
 void
 genrtl_break_stmt (void)
 {
-  emit_line_note (input_filename, input_line);
+  emit_line_note (input_location);
   if ( ! expand_exit_something ())
     error ("break statement not within loop or switch");
 }
@@ -612,7 +612,7 @@ build_continue_stmt (void)
 void
 genrtl_continue_stmt (void)
 {
-  emit_line_note (input_filename, input_line);
+  emit_line_note (input_location);
   if (! expand_continue_loop (0))
     error ("continue statement not within a loop");
 }
@@ -674,7 +674,7 @@ genrtl_switch_stmt (tree t)
        crash.  */
     cond = boolean_false_node;
 
-  emit_line_note (input_filename, input_line);
+  emit_line_note (input_location);
   expand_start_case (1, cond, TREE_TYPE (cond), "switch statement");
   expand_stmt (expand_unreachable_stmt (SWITCH_BODY (t), warn_notreached));
   expand_end_case_type (cond, SWITCH_TYPE (t));
@@ -746,7 +746,7 @@ genrtl_asm_stmt (tree cv_qualifier, tree string, tree output_operands,
       cv_qualifier = NULL_TREE;
     }
 
-  emit_line_note (input_filename, input_line);
+  emit_line_note (input_location);
   if (asm_input_p)
     expand_asm (string, cv_qualifier != NULL_TREE);
   else

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 695aa6c7686db25effa8f92d29624f0a5e929aa3..9ad4f98116577d33feace01f3018c41a9f4d479e 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-07  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * semantics.c: (genrtl_try_block) Adjust emit_line_note
+       calls.
+
 2003-07-07  Andreas Jaeger  <aj@suse.de>
 
        * search.c (lookup_base_r): Remove unused variable.

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 7daffa69aeb0dc86f3c40dd38ac5fa66f05cc86a..599aa1677601919a16c48ee899e84d0bf15bcb6d 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -798,7 +798,7 @@ genrtl_try_block (tree t)
   else
     {
       if (!FN_TRY_BLOCK_P (t)) 
-       emit_line_note (input_filename, input_line);
+       emit_line_note (input_location);
 
       expand_eh_region_start ();
       expand_stmt (TRY_STMTS (t));

diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index d191b286bb34fb800f236256610480ddab7f4029..3b926dfb3050c2ce7a1fceff5b15fcd7e19a85ea 100644 (file)
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -4665,35 +4665,31 @@ emit_barrier (void)
   return barrier;
 }
 
-/* Make an insn of code NOTE
-   with data-fields specified by FILE and LINE
-   and add it to the end of the doubly-linked list,
-   but only if line-numbers are desired for debugging info.  */
+/* Make line numbering NOTE insn for LOCATION add it to the end
+   of the doubly-linked list, but only if line-numbers are desired for
+   debugging info and it doesn't match the previous one.  */
 
 rtx
-emit_line_note (const char *file, int line)
+emit_line_note (location_t location)
 {
   rtx note;
-
-  if (line < 0)
-    abort ();
-
-  set_file_and_line_for_stmt (file, line);
-
-  if (file && last_location.file && !strcmp (file, last_location.file)
-      && line == last_location.line)
+  
+  set_file_and_line_for_stmt (location);
+  
+  if (location.file && last_location.file
+      && !strcmp (location.file, last_location.file)
+      && location.line == last_location.line)
     return NULL_RTX;
-  last_location.file = file;
-  last_location.line = line;
-
+  last_location = location;
+  
   if (no_line_numbers)
     {
       cur_insn_uid++;
       return NULL_RTX;
     }
 
-  note = emit_note (line);
-  NOTE_SOURCE_FILE (note) = file;
+  note = emit_note (location.line);
+  NOTE_SOURCE_FILE (note) = location.file;
   
   return note;
 }
@@ -4739,17 +4735,8 @@ emit_note (int note_no)
   return note;
 }
 
-/* Emit a NOTE, and don't omit it even if LINE is the previous note.  */
-
-rtx
-emit_line_note_force (const char *file, int line)
-{
-  last_location.line = -1;
-  return emit_line_note (file, line);
-}
-
 /* Cause next statement to emit a line note even if the line number
-   has not changed.  This is used at the beginning of a function.  */
+   has not changed.  */
 
 void
 force_next_line_note (void)

diff --git a/gcc/expr.c b/gcc/expr.c
index eedf68c1018d19a3d9f2689223bd7d796c7755ff..c32925a6bb472379dd598a888bfd515a171a3a2c 100644 (file)
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -6920,7 +6920,7 @@ expand_expr (tree exp, rtx target, enum machine_mode tmode, enum expand_modifier
        input_filename = EXPR_WFL_FILENAME (exp);
        input_line = EXPR_WFL_LINENO (exp);
        if (EXPR_WFL_EMIT_LINE_NOTE (exp))
-         emit_line_note (input_filename, input_line);
+         emit_line_note (input_location);
        /* Possibly avoid switching back and forth here.  */
        to_return = expand_expr (EXPR_WFL_NODE (exp), target, tmode, modifier);
        input_location = saved_loc;

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index ee22ec6c821519db9bc3923c231b817ced2d8596..b75edc693b59be68a1e70b88e31a836e6f96b441 100644 (file)
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jul  7 18:13:22 2003  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * com.c (bison_rule_pushlevel_, bison_rule_compstmt_): Adjust
+       emit_line_note calls.
+       * ste.c (ffeste_emit_line_note_): Likewise.
+
 2003-07-06  Andreas Jaeger  <aj@suse.de>
 
        * bad.c: Convert () to (void) in function definitions.

diff --git a/gcc/f/com.c b/gcc/f/com.c
index 7480cd33ddaff38eb08e5de5345d520ca7afc9e5..4d2860c4dcf5c4b14bb8095d769ba74a26507bf3 100644 (file)
--- a/gcc/f/com.c
+++ b/gcc/f/com.c
@@ -13116,7 +13116,7 @@ ffecom_which_entrypoint_decl (void)
 static void
 bison_rule_pushlevel_ (void)
 {
-  emit_line_note (input_filename, input_line);
+  emit_line_note (input_location);
   pushlevel (0);
   clear_last_expr ();
   expand_start_bindings (0);
@@ -13132,7 +13132,7 @@ bison_rule_compstmt_ (void)
   if (! keep)
     current_binding_level->names = NULL_TREE;
 
-  emit_line_note (input_filename, input_line);
+  emit_line_note (input_location);
   expand_end_bindings (getdecls (), keep, 0);
   t = poplevel (keep, 1, 0);
 

diff --git a/gcc/f/ste.c b/gcc/f/ste.c
index 53a20d89c234c2f45dc3655c93e6040a57fb9229..82435bc8dc8e2bbf8a8b5e7e463a6ad242c93a31 100644 (file)
--- a/gcc/f/ste.c
+++ b/gcc/f/ste.c
@@ -141,7 +141,7 @@ static void ffeste_subr_beru_ (ffestpBeruStmt *info, ffecomGfrt rt);
 /* Internal macros. */
 
 #define ffeste_emit_line_note_() \
-  emit_line_note (input_filename, input_line)
+  emit_line_note (input_location)
 #define ffeste_check_simple_() \
   assert(ffeste_statelet_ == FFESTE_stateletSIMPLE_)
 #define ffeste_check_start_() \

diff --git a/gcc/function.c b/gcc/function.c
index 00455053844c9ecf01e84416a8379946e6de6e33..742ad2f7340b079f1356932e7475d63e9fa69fa7 100644 (file)
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -6379,7 +6379,7 @@ init_function_start (tree subr)
      function prologue.  Note linenums could be missing, e.g. when
      compiling a Java .class file.  */
   if (DECL_SOURCE_LINE (subr))
-    emit_line_note (DECL_SOURCE_FILE (subr), DECL_SOURCE_LINE (subr));
+    emit_line_note (DECL_SOURCE_LOCATION (subr));
 
   /* Make sure first insn is a note even if we don't want linenums.
      This makes sure the first insn will never be deleted.
@@ -6918,8 +6918,8 @@ expand_function_end (void)
 
   /* Output a linenumber for the end of the function.
      SDB depends on this.  */
-
-  emit_line_note_force (input_filename, input_line);
+  force_next_line_note ();
+  emit_line_note (input_location);
 
   /* Before the return label (if any), clobber the return
      registers so that they are not propagated live to the rest of

diff --git a/gcc/integrate.c b/gcc/integrate.c
index b8ec068313b49ebf8665cd8231b040457fed0fdb..6c5fdf4739acfb1d3ad55f99a9f3ece9da703087 100644 (file)
--- a/gcc/integrate.c
+++ b/gcc/integrate.c
@@ -986,8 +986,8 @@ expand_inline_function (tree fndecl, tree parms, rtx target, int ignore,
          && ! (GET_CODE (XEXP (loc, 0)) == REG
                && REGNO (XEXP (loc, 0)) > LAST_VIRTUAL_REGISTER))
        {
-         rtx note = emit_line_note (DECL_SOURCE_FILE (formal),
-                                    DECL_SOURCE_LINE (formal));
+         rtx note = emit_line_note (DECL_SOURCE_LOCATION (formal));
+
          if (note)
            RTX_INTEGRATED_P (note) = 1;
 
@@ -1276,7 +1276,7 @@ expand_inline_function (tree fndecl, tree parms, rtx target, int ignore,
   if (flag_test_coverage)
     emit_note (NOTE_INSN_REPEATED_LINE_NUMBER);
 
-  emit_line_note (input_filename, input_line);
+  emit_line_note (input_location);
 
   /* If the function returns a BLKmode object in a register, copy it
      out of the temp register into a BLKmode memory object.  */

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 8627d269dc435105cfd254f4fb41dbffeaed7788..89bf762721fab15b10c3bc91f567879dc458f0ae 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-07  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * expr.c (expand_byte_code): Adjist emit_line_note call.
+
 2003-07-06  Neil Booth  <neil@daikokuya.co.uk>
 
        * lang.c (java_handle_option): Don't handle filenames.

diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index a69798720546f0f5a3490e065ec8f027af4bde8e..0e97e986122181bc3a7de0e597c8b5767adfbac4 100644 (file)
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -2828,7 +2828,7 @@ expand_byte_code (JCF *jcf, tree method)
              if (pc == PC)
                {
                  input_line = GET_u2 (linenumber_pointer - 2);
-                 emit_line_note (input_filename, input_line);
+                 emit_line_note (input_location);
                  if (!(instruction_bits[PC] & BCODE_HAS_MULTI_LINENUMBERS))
                    break;
                }

diff --git a/gcc/rtl.h b/gcc/rtl.h
index 975a752ae8250df9ce459a4e69204bbff01ae607..065e03ca807dcf2babf5d41b32a0ff23b77be99d 100644 (file)
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -1522,8 +1522,7 @@ extern rtx emit_label (rtx);
 extern rtx emit_barrier (void);
 extern rtx emit_note (int);
 extern rtx emit_note_copy (rtx);
-extern rtx emit_line_note (const char *, int);
-extern rtx emit_line_note_force (const char *, int);
+extern rtx emit_line_note (location_t);
 extern rtx make_insn_raw (rtx);
 extern void add_function_usage_to (rtx, rtx);
 extern rtx last_call_insn (void);
@@ -2092,7 +2091,7 @@ extern void purge_addressof (rtx);
 extern void purge_hard_subreg_sets (rtx);
 
 /* In stmt.c */
-extern void set_file_and_line_for_stmt (const char *, int);
+extern void set_file_and_line_for_stmt (location_t);
 extern void expand_null_return (void);
 extern void emit_jump (rtx);
 extern int preserve_subexpressions_p (void);

diff --git a/gcc/stmt.c b/gcc/stmt.c
index 493c87a1f860bcb478e83970b65e85e4fc0e194b..334e751bcde35319bb07ee9d646023e81c3cf2e9 100644 (file)
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -456,17 +456,15 @@ init_stmt_for_function (void)
 }
 \f
 /* Record the current file and line.  Called from emit_line_note.  */
+
 void
-set_file_and_line_for_stmt (const char *file, int line)
+set_file_and_line_for_stmt (location_t location)
 {
   /* If we're outputting an inline function, and we add a line note,
      there may be no CFUN->STMT information.  So, there's no need to
      update it.  */
   if (cfun->stmt)
-    {
-      emit_locus.file = file;
-      emit_locus.line = line;
-    }
+    emit_locus = location;
 }
 
 /* Emit a no-op instruction.  */
@@ -3991,7 +3989,7 @@ expand_decl_init (tree decl)
     }
   else if (DECL_INITIAL (decl) && TREE_CODE (DECL_INITIAL (decl)) != TREE_LIST)
     {
-      emit_line_note (DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl));
+      emit_line_note (DECL_SOURCE_LOCATION (decl));
       expand_assignment (decl, DECL_INITIAL (decl), 0, 0);
       emit_queue ();
     }

diff --git a/gcc/tree.h b/gcc/tree.h
index a11a7e5abaaf3edac4b2109c3959e7f26dc1870c..abb3c608ebb5ff0b11d21fabe110ff900f33c213 100644 (file)
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -2839,7 +2839,7 @@ extern void check_max_integer_computation_mode (tree);
 
 /* In emit-rtl.c */
 extern void start_sequence_for_rtl_expr (tree);
-extern rtx emit_line_note (const char *, int);
+extern rtx emit_line_note (location_t);
 
 /* In calls.c */
 

diff --git a/gcc/treelang/ChangeLog b/gcc/treelang/ChangeLog
index 7031e6e4253dc602ad6a029d7e93ef7b893d0438..2569137a0e2b821cef0fd5ef3b9dc758ee643990 100644 (file)
--- 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 57a4a48fbfd790615c6c09396e4e7049379f5852..c752a82f1c22c1f1a511da08e1dfc597a40b558b 100644 (file)
--- 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);