Tweak line numbers in output

From-SVN: r9540

diff --git a/gcc/integrate.c b/gcc/integrate.c
index 93a76839d8d023f1160e20737fb9d57116567c63..9ab7adf46354bca3b7d11ab87272e21335f785b3 100644 (file)
--- a/gcc/integrate.c
+++ b/gcc/integrate.c
@@ -1226,14 +1226,6 @@ expand_inline_function (fndecl, parms, target, ignore, type, structure_value_add
   /* Make a fresh binding contour that we can easily remove.  */
   pushlevel (0);
   expand_start_bindings (0);
-  if (GET_CODE (parm_insns) == NOTE
-      && NOTE_LINE_NUMBER (parm_insns) > 0)
-    {
-      rtx note = emit_note (NOTE_SOURCE_FILE (parm_insns),
-                           NOTE_LINE_NUMBER (parm_insns));
-      if (note)
-       RTX_INTEGRATED_P (note) = 1;
-    }
 
   /* Expand the function arguments.  Do this first so that any
      new registers get created before we allocate the maps.  */
@@ -1252,16 +1244,6 @@ expand_inline_function (fndecl, parms, target, ignore, type, structure_value_add
       enum machine_mode mode = TYPE_MODE (TREE_TYPE (formal));
       int invisiref = 0;
 
-      /* Make sure this formal has some correspondence in the users code
-       * before emitting any line notes for it.  */
-      if (DECL_SOURCE_LINE (formal))
-       {
-         rtx note = emit_note (DECL_SOURCE_FILE (formal),
-                               DECL_SOURCE_LINE (formal));
-         if (note)
-           RTX_INTEGRATED_P (note) = 1;
-       }
-
       arg_trees[i] = arg;
       loc = RTVEC_ELT (arg_vector, i);
 
@@ -1384,6 +1366,15 @@ expand_inline_function (fndecl, parms, target, ignore, type, structure_value_add
   if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_NEEDS_CONTEXT)
     static_chain_value = lookup_static_chain (fndecl);
 
+  if (GET_CODE (parm_insns) == NOTE
+      && NOTE_LINE_NUMBER (parm_insns) > 0)
+    {
+      rtx note = emit_note (NOTE_SOURCE_FILE (parm_insns),
+                           NOTE_LINE_NUMBER (parm_insns));
+      if (note)
+       RTX_INTEGRATED_P (note) = 1;
+    }
+
   /* Process each argument.  For each, set up things so that the function's
      reference to the argument will refer to the argument being passed.
      We only replace REG with REG here.  Any simplifications are done