diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d363f33688a..7b606eccda8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-17  Richard Henderson  <rth@redhat.com>
+
+	* tree-optimize.c (tree_rest_of_compilation): Save and restore
+	input_location.
+
 2003-09-17  Daniel Jacobowitz  <drow@mvista.com>
 
 	* config/rs6000/sysv4.h (LIB_LINUX_SPEC): Give -lpthread before -lc.
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7d3ddc36d90..6ea7ffb1199 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-17  Richard Henderson  <rth@redhat.com>
+
+	* semantics.c (expand_body): Don't save/restore input_location.
+
 2003-09-17  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/12266
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index dcd81cdf25f..37dca0a6a57 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -2845,7 +2845,6 @@ emit_associated_thunks (tree fn)
 void
 expand_body (tree fn)
 {
-  location_t saved_loc;
   tree saved_function;
   
   /* Compute the appropriate object-file linkage for inline
@@ -2862,7 +2861,6 @@ expand_body (tree fn)
     return;
 
   /* ??? When is this needed?  */
-  saved_loc = input_location;
   saved_function = current_function_decl;
 
   timevar_push (TV_INTEGRATION);
@@ -2872,7 +2870,6 @@ expand_body (tree fn)
   tree_rest_of_compilation (fn, function_depth > 1);
 
   current_function_decl = saved_function;
-  input_location = saved_loc;
 
   extract_interface_info ();
 
diff --git a/gcc/tree-optimize.c b/gcc/tree-optimize.c
index 253fda2f3cd..397bb490cb6 100644
--- a/gcc/tree-optimize.c
+++ b/gcc/tree-optimize.c
@@ -95,6 +95,8 @@ clear_decl_rtl (tree *tp, int *walk_subtrees ATTRIBUTE_UNUSED, void *data)
 void
 tree_rest_of_compilation (tree fndecl, bool nested_p)
 {
+  location_t saved_loc;
+
   timevar_push (TV_EXPAND);
 
   if (flag_unit_at_a_time && !cgraph_global_info_ready)
@@ -102,6 +104,7 @@ tree_rest_of_compilation (tree fndecl, bool nested_p)
 
   /* Initialize the RTL code for the function.  */
   current_function_decl = fndecl;
+  saved_loc = input_location;
   input_location = DECL_SOURCE_LOCATION (fndecl);
   init_function_start (fndecl);
 
@@ -232,5 +235,7 @@ tree_rest_of_compilation (tree fndecl, bool nested_p)
       DECL_ARGUMENTS (fndecl) = 0;
     }
 
+  input_location = saved_loc;
+
   timevar_pop (TV_EXPAND);
 }