Remove global call sets: cfgcleanup.c

old_insns_match_p just tests whether two instructions are
similar enough to merge.  With insn_callee_abi it makes more
sense to compare the ABIs directly.

2019-09-30  Richard Sandiford  <richard.sandiford@arm.com>

gcc/
	* cfgcleanup.c (old_insns_match_p): Compare the ABIs of calls
	instead of the call-clobbered sets.

From-SVN: r276314

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d912a87816120c659bfa41c121a17e1590f6f889..a3e4ff24c8d6c461c09f812a9f31b28588c7c5ed 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-09-30  Richard Sandiford  <richard.sandiford@arm.com>
+
+       * cfgcleanup.c (old_insns_match_p): Compare the ABIs of calls
+       instead of the call-clobbered sets.
+
 2019-09-30  Richard Sandiford  <richard.sandiford@arm.com>
 
        * caller-save.c (setup_save_areas): Remove redundant |s of

diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c
index 329fa0cc901412e74d64807dac5776985f585738..ced7e0a4283c65b0e72008c14673623fe6310f64 100644 (file)
--- a/gcc/cfgcleanup.c
+++ b/gcc/cfgcleanup.c
@@ -1227,13 +1227,7 @@ old_insns_match_p (int mode ATTRIBUTE_UNUSED, rtx_insn *i1, rtx_insn *i2)
            }
        }
 
-      HARD_REG_SET i1_used = insn_callee_abi (i1).full_reg_clobbers ();
-      HARD_REG_SET i2_used = insn_callee_abi (i2).full_reg_clobbers ();
-      /* ??? This preserves traditional behavior; it might not be needed.  */
-      i1_used |= fixed_reg_set;
-      i2_used |= fixed_reg_set;
-
-      if (i1_used != i2_used)
+      if (insn_callee_abi (i1) != insn_callee_abi (i2))
         return dir_none;
     }