(expand_inline_function): Increment map->const_age before copying REG_NOTES.

From-SVN: r4604

diff --git a/gcc/integrate.c b/gcc/integrate.c
index 8bb32dace7a3edc2b3fe82c1d692f4a43e4781ee..e18f69041ea4d9278af93ce817425c81c7257672 100644 (file)
--- a/gcc/integrate.c
+++ b/gcc/integrate.c
@@ -1708,7 +1708,10 @@ expand_inline_function (fndecl, parms, target, ignore, type, structure_value_add
       map->insn_map[INSN_UID (insn)] = copy;
     }
 
-  /* Now copy the REG_NOTES.  */
+  /* Now copy the REG_NOTES.  Increment const_age, so that only constants
+     from parameters can be substituted in.  These are the only ones that
+     are valid across the entire function.  */
+  map->const_age++;
   for (insn = insns; insn; insn = NEXT_INSN (insn))
     if (GET_RTX_CLASS (GET_CODE (insn)) == 'i'
        && map->insn_map[INSN_UID (insn)]