input.h (lineno): Rename to ...

	* input.h (lineno): Rename to ...
	(input_line): ... here.
	* tree.h (lineno): Rename to ...
	(input_line): ... here.
	* scan.h (lineno): Rename to ...
	(input_line): ... here.
	* toplev.c (lineno): Rename to ...
	(input_line): ... here.
	(push_srcloc, pop_srcloc):  Rename lineno to input_line.
	* c-common.c (c_expand_start_cond, fname_decl): Likewise.
	* c-decl.c (poplevel, pop_label_level, lookup_label, lookup_tag,
	store_parm_decls, c_expand_body_1): Likewise.
	* c-errors.c (pedwarn_c99): Likewise.
	* c-format.c (status_warning): Likewise.
	* c-lex.c (fe_file_change, cb_def_pragma, c_lex): Likewise.
	* c-opts.c (c_common_post_options, c_common_parse_file): Likewise.
	* c-parse.in (save_filename, maybe_type_qual, ifc): Likwise.
	* c-semantics.c (finish_stmt_tree, build_stmt, emit_local_var,
	gentrtl_goto_stmt, genrtl_expr_stmt_value, genrtl_decl_stmt,
	genrtl_if_stmt, genrtl_while_stmt, genrtl_do_stmt,
	genrtl_return_stmt, genrtl_for_stmt, build_break_stmt,
	build_continue_stmt, genrtl_switch_stmt, genrtl_asm_stmt,
	prep_stmt, find_reachable_label, expand_unreachable_stmt): Likewise.
	* coverage.c (create_coverage): Likewise.
	* diagnostic.c (pedwarn, sorry, error, fatal_error,
	internal_error, warning, diagnostic_report_current_module,
	inform): Likewise.
	* expr.c (expand_expr): Likewise.
	* integrate.c (expand_inline_function,
	output_inline_function): Likewise.
	* rtl-error.c (file_and_line_for_asm): Likewise.
	* tree-inline.c (find_alloca_call, find_builtin_longjmp_call,
	walk_tree): Likewise.
	* tree.c (make_node): Likewise.
	* ada, cp, f, java, objc, treelang: Likewise.

	ada
	* trans.c (build_unit_elab, set_lineno): Rename lineno to
	input_line.
	* utils.c (pushdecl, create_label_decl, begin_subprog_body,
	end_subprog_body): Likewise.
	* utils2.c (build_call_raise): Likewise.

	cp
	* class.c (finish_struct): Rename lineno to input_line.
	* decl.c (push_binding_level, pop_binding_level,
	suspend_binding_level, resume_binding_level, make_label_decl,
	use_label, start_function): Likewise.
	* decl2.c (warn_if_unknown_interface,
	start_static_initialization_or_destruction,
	generate_ctor_or_dtor_function, finish_file): Likewise.
	* error.c (cp_line_of, print_instantiation_full_context,
	print_instantiation_context): Likewise.
	* except.c (check_handlers_1, check_handlers): Likewise.
	* init.c (create_temporary_var): Likewise.
	* method.c (use_thunk, synthesize_method): Likewise.
	* parser.c (cp_lexer_set_source_position_from_token,
	cp_lexer_get_preprocessor_token): Likewise.
	* pt.c (push_tinst_level, pop_tinst_level,
	tsubst_friend_function, instantiate_class_template, tsubst_decl,
	tsubst, tsubst_expr, instantiate_decl): Likewise.
	* semantics.c (genrtl_try_block, finish_label_stmt,
	begin_class_definition, expand_body,
	genrtl_finish_function): Likewise.
	* tree.c (build_min_nt, build_min): Likewise.

	f
	* ansify.c (die_unless): Rename lineno to input_line.
	* com.c (ffecom_subscript_check_, ffecom_do_entry_,
	ffecom_gen_sfuncdef_, ffecom_start_progunit_,
	ffecom_sym_transform_, ffecom_sym_transform_assign_,
	bison_rule_pushlevel_, bison_rule_compstmt_, finish_function,
	store_parm_decls): Likewise.
	* intrin.c (ffeintrin_fulfill_generic): Likewise.
	* lex.c (ffelex_hash_, ffelex_include_, ffelex_next_line_,
	ffelex_file_fixed, ffelex_file_free): Likewise.
	* std.c (ffestd_exec_end): Likewise.
	* ste.c (ffeste_emit_line_note_, ffeste_start_block_,
	ffeste_start_stmt_): Likewise.
	* ste.h (ffeste_filelinenum, ffeste_set_line): Likewise.

	java
	* lex.h (lineno): Rename to ...
	(input_line): ... here
	* parse-scan.y (lineno): Rename to ...
	(input_line): ... here.
	(reset_report): Rename lineno to input_line.
	* check-init.c (check_init): Likewise.
	* class.c (push_class): Likewise.
	* decl.c (complete_start_java_method, end_java_method): Likewise.
	* expr.c (expand_byte_code): Likewise.
	* jcf-parse.c (give_name_to_class, parse_class_file): Likewise.
	* jcf-write.c (generate_bytecode_insns): Likewise.
	* lex.c (java_init_lex, java_allocate_new_line,
	do_java_lex): Likewise.
	* parse.h (YYNOT_TWICE): Likewise.
	* parse.y (empty_statement, expression_statement,
	java_pop_parser_context, java_parser_context_save_global,
	yyerror, register_fields, method_header, safe_layout_class,
	find_in_imports_on_demand, create_artificial_method,
	source_end_java_method, start_complete_expand_method,
	build_thisn_assign, java_complete_lhs,
	maybe_absorb_scoping_block): Likewise.

	objc
	* objc-act.c (objc_init): Rename lineno to input_line.
	(build_module_descriptor, build_selector_translation_table,
	build_protocol_template, build_method_prototype_list_template,
	build_category_template, build_selector_table,
	build_class_template, build_super_template, build_ivar_template,
	build_ivar_list_template, build_method_list_template,
	build_method_template, add_instance_variable): Likewise.

	treelang
	* tree1.c (treelang_init): Rename lineno to input_line.

From-SVN: r66333

11 files changed, 69 insertions, 67 deletions

diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 7dbfa76..e45781e 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -5252,7 +5252,7 @@ tree
 finish_struct (tree t, tree attributes)
 {
   const char *saved_filename = input_filename;
-  int saved_lineno = lineno;
+  int saved_lineno = input_line;
 
   /* Now that we've got all the field declarations, reverse everything
      as necessary.  */
@@ -5263,7 +5263,7 @@ finish_struct (tree t, tree attributes)
   /* Nadger the current location so that diagnostics point to the start of
      the struct, not the end.  */
   input_filename = DECL_SOURCE_FILE (TYPE_NAME (t));
-  lineno = DECL_SOURCE_LINE (TYPE_NAME (t));
+  input_line = DECL_SOURCE_LINE (TYPE_NAME (t));
 
   if (processing_template_decl)
     {
@@ -5274,7 +5274,7 @@ finish_struct (tree t, tree attributes)
     finish_struct_1 (t);
 
   input_filename = saved_filename;
-  lineno = saved_lineno;
+  input_line = saved_lineno;
 
   TYPE_BEING_DEFINED (t) = 0;
 
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 2c911a5..6e04cef 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -495,7 +495,7 @@ push_binding_level (struct cp_binding_level *newlevel,
   newlevel->binding_depth = binding_depth;
   indent ();
   fprintf (stderr, "push %s level 0x%08x line %d\n",
-	   (is_class_level) ? "class" : "block", newlevel, lineno);
+	   (is_class_level) ? "class" : "block", newlevel, input_line);
   is_class_level = 0;
   binding_depth++;
 #endif /* defined(DEBUG_BINDING_LEVELS) */
@@ -532,7 +532,7 @@ pop_binding_level (void)
   indent ();
   fprintf (stderr, "pop  %s level 0x%08x line %d\n",
 	  (is_class_level) ? "class" : "block",
-	  current_binding_level, lineno);
+	  current_binding_level, input_line);
   if (is_class_level != (current_binding_level == class_binding_level))
     {
       indent ();
@@ -571,7 +571,7 @@ suspend_binding_level (void)
   indent ();
   fprintf (stderr, "suspend  %s level 0x%08x line %d\n",
 	  (is_class_level) ? "class" : "block",
-	  current_binding_level, lineno);
+	  current_binding_level, input_line);
   if (is_class_level != (current_binding_level == class_binding_level))
     {
       indent ();
@@ -596,7 +596,7 @@ resume_binding_level (struct cp_binding_level* b)
   b->binding_depth = binding_depth;
   indent ();
   fprintf (stderr, "resume %s level 0x%08x line %d\n",
-	   (is_class_level) ? "class" : "block", b, lineno);
+	   (is_class_level) ? "class" : "block", b, input_line);
   is_class_level = 0;
   binding_depth++;
 #endif /* defined(DEBUG_BINDING_LEVELS) */
@@ -4598,7 +4598,7 @@ make_label_decl (tree id, int local_p)
 
   /* Say where one reference is to the label, for the sake of the
      error if it is not defined.  */
-  DECL_SOURCE_LINE (decl) = lineno;
+  DECL_SOURCE_LINE (decl) = input_line;
   DECL_SOURCE_FILE (decl) = input_filename;
 
   /* Record the fact that this identifier is bound to this label.  */
@@ -4625,7 +4625,7 @@ use_label (tree decl)
       new_ent->label_decl = decl;
       new_ent->names_in_scope = current_binding_level->names;
       new_ent->binding_level = current_binding_level;
-      new_ent->o_goto_locus.line = lineno;
+      new_ent->o_goto_locus.line = input_line;
       new_ent->o_goto_locus.file = input_filename;
       new_ent->next = named_label_uses;
       named_label_uses = new_ent;
@@ -13486,7 +13486,7 @@ start_function (tree declspecs, tree declarator, tree attrs, int flags)
      CFUN set up, and our per-function variables initialized.
      FIXME factor out the non-RTL stuff.  */
   bl = current_binding_level;
-  init_function_start (decl1, input_filename, lineno);
+  init_function_start (decl1, input_filename, input_line);
   current_binding_level = bl;
 
   /* Even though we're inside a function body, we still don't want to
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 00a77df..71192ef 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -178,17 +178,17 @@ warn_if_unknown_interface (tree decl)
   if (flag_alt_external_templates)
     {
       tree til = tinst_for_decl ();
-      int sl = lineno;
+      int sl = input_line;
       const char *sf = input_filename;
 
       if (til)
 	{
-	  lineno = TINST_LINE (til);
+	  input_line = TINST_LINE (til);
 	  input_filename = TINST_FILE (til);
 	}
       warning ("template `%#D' instantiated in file without #pragma interface",
 		  decl);
-      lineno = sl;
+      input_line = sl;
       input_filename = sf;
     }
   else
@@ -2234,7 +2234,7 @@ start_static_initialization_or_destruction (tree decl, int initp)
      that the debugger will show somewhat sensible file and line
      information.  */
   input_filename = DECL_SOURCE_FILE (decl);
-  lineno = DECL_SOURCE_LINE (decl);
+  input_line = DECL_SOURCE_LINE (decl);
 
   /* Because of:
 
@@ -2475,7 +2475,7 @@ generate_ctor_or_dtor_function (bool constructor_p, int priority,
   size_t i;
 
   input_filename = locus->file;
-  lineno = locus->line++;
+  input_line = locus->line++;
   
   /* We use `I' to indicate initialization and `D' to indicate
      destruction.  */
@@ -2555,7 +2555,7 @@ finish_file ()
   unsigned ssdf_count = 0;
 
   locus.file = input_filename;
-  locus.line = lineno;
+  locus.line = input_line;
   at_eof = 1;
 
   /* Bad parse errors.  Just forget about it.  */
@@ -2567,7 +2567,7 @@ finish_file ()
 
   /* Otherwise, GDB can get confused, because in only knows
      about source for LINENO-1 lines.  */
-  lineno -= 1;
+  input_line -= 1;
 
   interface_unknown = 1;
   interface_only = 0;
@@ -2687,7 +2687,7 @@ finish_file ()
 	  /* Set the line and file, so that it is obviously not from
 	     the source file.  */
 	  input_filename = locus.file;
-	  lineno = locus.line;
+	  input_line = locus.line;
 	  ssdf_body = start_static_storage_duration_function (ssdf_count);
 
 	  /* Make sure the back end knows about all the variables.  */
@@ -2716,7 +2716,7 @@ finish_file ()
 	  /* Finish up the static storage duration function for this
 	     round.  */
 	  input_filename = locus.file;
-	  lineno = locus.line;
+	  input_line = locus.line;
 	  finish_static_storage_duration_function (ssdf_body);
 
 	  /* All those initializations and finalizations might cause
@@ -2906,7 +2906,7 @@ finish_file ()
       dump_time_statistics ();
     }
   input_filename = locus.file;
-  lineno = locus.line;
+  input_line = locus.line;
 }
 
 /* T is the parse tree for an expression.  Return the expression after
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 3e299de..ee92aa8 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -1,7 +1,7 @@
 /* Call-backs for C++ error reporting.
    This code is non-reentrant.
-   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002
-   Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002,
+   2003 Free Software Foundation, Inc.
    This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify
@@ -2159,7 +2159,7 @@ cp_line_of (tree t)
     line = DECL_SOURCE_LINE (t);
 
   if (line == 0)
-    return lineno;
+    return input_line;
 
   return line;
 }
@@ -2406,7 +2406,7 @@ static void
 print_instantiation_full_context (diagnostic_context *context)
 {
   tree p = current_instantiation ();
-  int line = lineno;
+  int line = input_line;
   const char *file = input_filename;
 
   if (p)
@@ -2468,7 +2468,7 @@ void
 print_instantiation_context (void)
 {
   print_instantiation_partial_context
-    (global_dc, current_instantiation (), input_filename, lineno);
+    (global_dc, current_instantiation (), input_filename, input_line);
   diagnostic_flush_buffer (global_dc);
 }
 
diff --git a/gcc/cp/except.c b/gcc/cp/except.c
index ae37b29..b8576be 100644
--- a/gcc/cp/except.c
+++ b/gcc/cp/except.c
@@ -915,10 +915,10 @@ check_handlers_1 (tree master, tree handlers)
     if (TREE_TYPE (handler)
 	&& can_convert_eh (type, TREE_TYPE (handler)))
       {
-	lineno = STMT_LINENO (handler);
+	input_line = STMT_LINENO (handler);
 	warning ("exception of type `%T' will be caught",
 		    TREE_TYPE (handler));
-	lineno = STMT_LINENO (master);
+	input_line = STMT_LINENO (master);
 	warning ("   by earlier handler for `%T'", type);
 	break;
       }
@@ -930,19 +930,20 @@ void
 check_handlers (tree handlers)
 {
   tree handler;
-  int save_line = lineno;
+  int save_line = input_line;
+  
   for (handler = handlers; handler; handler = TREE_CHAIN (handler))
     {
       if (TREE_CHAIN (handler) == NULL_TREE)
 	/* No more handlers; nothing to shadow.  */;
       else if (TREE_TYPE (handler) == NULL_TREE)
 	{
-	  lineno = STMT_LINENO (handler);
+	  input_line = STMT_LINENO (handler);
 	  pedwarn
 	    ("`...' handler must be the last handler for its try block");
 	}
       else
 	check_handlers_1 (handler, TREE_CHAIN (handler));
     }
-  lineno = save_line;
+  input_line = save_line;
 }
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index d4beb0b..96f7e77 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -2676,7 +2676,7 @@ create_temporary_var (type)
   TREE_USED (decl) = 1;
   DECL_ARTIFICIAL (decl) = 1;
   DECL_SOURCE_FILE (decl) = input_filename;
-  DECL_SOURCE_LINE (decl) = lineno;
+  DECL_SOURCE_LINE (decl) = input_line;
   DECL_IGNORED_P (decl) = 1;
   DECL_CONTEXT (decl) = current_function_decl;
 
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 49bb116..fd61d20 100644
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -1,7 +1,7 @@
 /* Handle the hair of processing (but not expanding) inline functions.
    Also manage function and variable name overloading.
    Copyright (C) 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 
-   1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    Contributed by Michael Tiemann (tiemann@cygnus.com)
 
 This file is part of GCC.
@@ -429,7 +429,7 @@ use_thunk (tree thunk_fndecl, bool emit_p)
       DECL_RESULT (thunk_fndecl)
 	= build_decl (RESULT_DECL, 0, integer_type_node);
       fnname = XSTR (XEXP (DECL_RTL (thunk_fndecl), 0), 0);
-      init_function_start (thunk_fndecl, input_filename, lineno);
+      init_function_start (thunk_fndecl, input_filename, input_line);
       current_function_is_thunk = 1;
       assemble_start_function (thunk_fndecl, fnname);
 
@@ -754,7 +754,7 @@ synthesize_method (tree fndecl)
      where the attempt to generate the function occurs, giving the
      user a hint as to why we are attempting to generate the
      function.  */
-  DECL_SOURCE_LINE (fndecl) = lineno;
+  DECL_SOURCE_LINE (fndecl) = input_line;
   DECL_SOURCE_FILE (fndecl) = input_filename;
 
   interface_unknown = 1;
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 2d54e7e..3664302 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -407,7 +407,7 @@ cp_lexer_set_source_position_from_token (cp_lexer *lexer ATTRIBUTE_UNUSED ,
   /* Update the line number.  */
   if (token->type != CPP_EOF)
     {
-      lineno = token->line_number;
+      input_line = token->line_number;
       input_filename = token->file_name;
     }
 }
@@ -651,7 +651,7 @@ cp_lexer_get_preprocessor_token (cp_lexer *lexer ATTRIBUTE_UNUSED ,
 	}
     }
   /* Now we've got our token.  */
-  token->line_number = lineno;
+  token->line_number = input_line;
   token->file_name = input_filename;
 
   /* Check to see if this token is a keyword.  */
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 73ada26..45c99f9 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -4785,7 +4785,7 @@ push_tinst_level (d)
       return 0;
     }
 
-  new = build_expr_wfl (d, input_filename, lineno, 0);
+  new = build_expr_wfl (d, input_filename, input_line, 0);
   TREE_CHAIN (new) = current_tinst_level;
   current_tinst_level = new;
 
@@ -4809,7 +4809,7 @@ pop_tinst_level ()
 
   /* Restore the filename and line number stashed away when we started
      this instantiation.  */
-  lineno = TINST_LINE (old);
+  input_line = TINST_LINE (old);
   input_filename = TINST_FILE (old);
   extract_interface_info ();
   
@@ -4861,10 +4861,10 @@ tsubst_friend_function (decl, args)
      tree args;
 {
   tree new_friend;
-  int line = lineno;
+  int line = input_line;
   const char *file = input_filename;
 
-  lineno = DECL_SOURCE_LINE (decl);
+  input_line = DECL_SOURCE_LINE (decl);
   input_filename = DECL_SOURCE_FILE (decl);
 
   if (TREE_CODE (decl) == FUNCTION_DECL 
@@ -5072,7 +5072,7 @@ tsubst_friend_function (decl, args)
     }
 
  done:
-  lineno = line;
+  input_line = line;
   input_filename = file;
   return new_friend;
 }
@@ -5432,10 +5432,11 @@ instantiate_class_template (type)
 		{
 		  tree r;
 
-		  /* The the file and line for this declaration, to assist
-		     in error message reporting.  Since we called 
-		     push_tinst_level above, we don't need to restore these.  */
-		  lineno = DECL_SOURCE_LINE (t);
+		  /* The the file and line for this declaration, to
+		     assist in error message reporting.  Since we
+		     called push_tinst_level above, we don't need to
+		     restore these.  */
+		  input_line = DECL_SOURCE_LINE (t);
 		  input_filename = DECL_SOURCE_FILE (t);
 
 		  r = tsubst (t, args, tf_error | tf_warning, NULL_TREE);
@@ -5538,7 +5539,7 @@ instantiate_class_template (type)
      implicit functions at a predictable point, and the same point
      that would be used for non-template classes.  */
   typedecl = TYPE_MAIN_DECL (type);
-  lineno = DECL_SOURCE_LINE (typedecl);
+  input_line = DECL_SOURCE_LINE (typedecl);
   input_filename = DECL_SOURCE_FILE (typedecl);
 
   unreverse_member_declarations (type);
@@ -5883,9 +5884,9 @@ tsubst_decl (t, args, type, complain)
   tree in_decl = t;
 
   /* Set the filename and linenumber to improve error-reporting.  */
-  saved_lineno = lineno;
+  saved_lineno = input_line;
   saved_filename = input_filename;
-  lineno = DECL_SOURCE_LINE (t);
+  input_line = DECL_SOURCE_LINE (t);
   input_filename = DECL_SOURCE_FILE (t);
 
   switch (TREE_CODE (t))
@@ -6352,7 +6353,7 @@ tsubst_decl (t, args, type, complain)
     } 
 
   /* Restore the file and line information.  */
-  lineno = saved_lineno;
+  input_line = saved_lineno;
   input_filename = saved_filename;
 
   return r;
@@ -6875,7 +6876,7 @@ tsubst (t, args, complain, in_decl)
 	       message to avoid spewing a ton of messages during a
 	       single bad template instantiation.  */
 	    if (complain & tf_error
-		&& (last_line != lineno || last_file != input_filename))
+		&& (last_line != input_line || last_file != input_filename))
 	      {
 		if (TREE_CODE (type) == VOID_TYPE)
 		  error ("forming reference to void");
@@ -6883,7 +6884,7 @@ tsubst (t, args, complain, in_decl)
 		  error ("forming %s to reference type `%T'",
 			    (code == POINTER_TYPE) ? "pointer" : "reference",
 			    type);
-		last_line = lineno;
+		last_line = input_line;
 		last_file = input_filename;
 	      }
 
@@ -7779,7 +7780,7 @@ tsubst_expr (t, args, complain, in_decl)
       break;
 
     case LABEL_STMT:
-      lineno = STMT_LINENO (t);
+      input_line = STMT_LINENO (t);
       finish_label_stmt (DECL_NAME (LABEL_STMT_LABEL (t)));
       break;
 
@@ -10758,7 +10759,7 @@ instantiate_decl (d, defer_ok)
   tree spec;
   tree gen_tmpl;
   int pattern_defined;
-  int line = lineno;
+  int line = input_line;
   int need_push;
   const char *file = input_filename;
 
@@ -10824,7 +10825,7 @@ instantiate_decl (d, defer_ok)
   else
     pattern_defined = ! DECL_IN_AGGR_P (code_pattern);
 
-  lineno = DECL_SOURCE_LINE (d);
+  input_line = DECL_SOURCE_LINE (d);
   input_filename = DECL_SOURCE_FILE (d);
 
   if (pattern_defined)
@@ -10912,7 +10913,7 @@ instantiate_decl (d, defer_ok)
      because it's used by add_pending_template.  */
   else if (! pattern_defined || defer_ok)
     {
-      lineno = line;
+      input_line = line;
       input_filename = file;
 
       if (at_eof && !pattern_defined 
@@ -10941,7 +10942,7 @@ instantiate_decl (d, defer_ok)
   
   /* We already set the file and line above.  Reset them now in case
      they changed as a result of calling regenerate_decl_from_template.  */
-  lineno = DECL_SOURCE_LINE (d);
+  input_line = DECL_SOURCE_LINE (d);
   input_filename = DECL_SOURCE_FILE (d);
 
   if (TREE_CODE (d) == VAR_DECL)
@@ -11047,7 +11048,7 @@ instantiate_decl (d, defer_ok)
     pop_from_top_level ();
 
 out:
-  lineno = line;
+  input_line = line;
   input_filename = file;
 
   pop_tinst_level ();
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index cdb24f6..a527abb 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -745,7 +745,7 @@ genrtl_try_block (t)
   else
     {
       if (!FN_TRY_BLOCK_P (t)) 
-	emit_line_note (input_filename, lineno);
+	emit_line_note (input_filename, input_line);
 
       expand_eh_region_start ();
       expand_stmt (TRY_STMTS (t));
@@ -1105,7 +1105,7 @@ tree
 finish_label_stmt (name)
      tree name;
 {
-  tree decl = define_label (input_filename, lineno, name);
+  tree decl = define_label (input_filename, input_line, name);
   return add_stmt (build_stmt (LABEL_STMT, decl));
 }
 
@@ -1805,7 +1805,7 @@ begin_class_definition (t)
 
   /* Update the location of the decl.  */
   DECL_SOURCE_FILE (TYPE_NAME (t)) = input_filename;
-  DECL_SOURCE_LINE (TYPE_NAME (t)) = lineno;
+  DECL_SOURCE_LINE (TYPE_NAME (t)) = input_line;
   
   if (TYPE_BEING_DEFINED (t))
     {
@@ -2386,10 +2386,10 @@ expand_body (fn)
   /* Save the current file name and line number.  When we expand the
      body of the function, we'll set LINENO and INPUT_FILENAME so that
      error-mesages come out in the right places.  */
-  saved_lineno = lineno;
+  saved_lineno = input_line;
   saved_input_filename = input_filename;
   saved_function = current_function_decl;
-  lineno = DECL_SOURCE_LINE (fn);
+  input_line = DECL_SOURCE_LINE (fn);
   input_filename = DECL_SOURCE_FILE (fn);
   current_function_decl = fn;
 
@@ -2413,7 +2413,7 @@ expand_body (fn)
 
   /* The outermost statement for a function contains the line number
      recorded when we finished processing the function.  */
-  lineno = STMT_LINENO (DECL_SAVED_TREE (fn));
+  input_line = STMT_LINENO (DECL_SAVED_TREE (fn));
 
   /* Generate code for the function.  */
   genrtl_finish_function (fn);
@@ -2433,7 +2433,7 @@ expand_body (fn)
 
   /* And restore the current source position.  */
   current_function_decl = saved_function;
-  lineno = saved_lineno;
+  input_line = saved_lineno;
   input_filename = saved_input_filename;
   extract_interface_info ();
 
@@ -2577,7 +2577,7 @@ genrtl_finish_function (fn)
   immediate_size_expand = 1;
 
   /* Generate rtl for function exit.  */
-  expand_function_end (input_filename, lineno, 0);
+  expand_function_end (input_filename, input_line, 0);
 
   /* If this is a nested function (like a template instantiation that
      we're compiling in the midst of compiling something else), push a
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index ee17cea..0566a09 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -1512,7 +1512,7 @@ build_min_nt VPARAMS ((enum tree_code code, ...))
 
   t = make_node (code);
   length = TREE_CODE_LENGTH (code);
-  TREE_COMPLEXITY (t) = lineno;
+  TREE_COMPLEXITY (t) = input_line;
 
   for (i = 0; i < length; i++)
     {
@@ -1541,7 +1541,7 @@ build_min VPARAMS ((enum tree_code code, tree tt, ...))
   t = make_node (code);
   length = TREE_CODE_LENGTH (code);
   TREE_TYPE (t) = tt;
-  TREE_COMPLEXITY (t) = lineno;
+  TREE_COMPLEXITY (t) = input_line;
 
   for (i = 0; i < length; i++)
     {