* integrate.c (copy_insn_list): Substitute NOTE_EXPECTED_VALUE.

From-SVN: r41868

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3b9b4a60eb03a5668f71455e5a2a434778938c86..c8f3f0aad44ea33e958b74f0eb3a8c8b37fe64a2 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-05  Richard Henderson  <rth@redhat.com>
+
+       * integrate.c (copy_insn_list): Substitute NOTE_EXPECTED_VALUE.
+
 2001-05-05  Richard Henderson  <rth@redhat.com>
 
        * except.c (remove_fixup_regions): Adjust REG_EH_REGION notes

diff --git a/gcc/integrate.c b/gcc/integrate.c
index a4300303825379a3875f8135a256f680541fec20..6795d823cc55f1625d1d5fa16275cd73652e2ca4 100644 (file)
--- a/gcc/integrate.c
+++ b/gcc/integrate.c
@@ -1536,6 +1536,11 @@ copy_insn_list (insns, map, static_chain_value)
                  else
                    NOTE_BLOCK (copy) = *mapped_block_p;
                }
+             else if (copy
+                      && NOTE_LINE_NUMBER (copy) == NOTE_INSN_EXPECTED_VALUE)
+               NOTE_EXPECTED_VALUE (copy)
+                 = copy_rtx_and_substitute (NOTE_EXPECTED_VALUE (insn),
+                                            map, 0);
            }
          else
            copy = 0;