(expand_inline_function): When copy REG_NOTES, must

also call subst_constants.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@4587 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/integrate.c b/gcc/integrate.c
index ad26413..8bb32da 100644 (file)
--- a/gcc/integrate.c
+++ b/gcc/integrate.c
@@ -1711,9 +1711,16 @@ expand_inline_function (fndecl, parms, target, ignore, type, structure_value_add
   /* Now copy the REG_NOTES.  */
   for (insn = insns; insn; insn = NEXT_INSN (insn))
     if (GET_RTX_CLASS (GET_CODE (insn)) == 'i'
-       && map->insn_map[INSN_UID (insn)])
-      REG_NOTES (map->insn_map[INSN_UID (insn)])
-       = copy_rtx_and_substitute (REG_NOTES (insn), map);
+       && map->insn_map[INSN_UID (insn)]
+       && REG_NOTES (insn))
+      {
+       rtx tem = copy_rtx_and_substitute (REG_NOTES (insn), map);
+       /* We must also do subst_constants, in case one of our parameters
+          has const type and constant value.  */
+       subst_constants (&tem, NULL_RTX, map);
+       apply_change_group ();
+       REG_NOTES (map->insn_map[INSN_UID (insn)]) = tem;
+      }
 
   if (local_return_label)
     emit_label (local_return_label);