Revert 'Use actual_call_used_reg_set to find conflicting regs'

2015-03-16  Tom de Vries  <tom@codesourcery.com>

	PR middle-end/65414
	Revert:
	2015-03-12  Tom de Vries  <tom@codesourcery.com>

	PR rtl-optimization/64895
	* lra-lives.c (check_pseudos_live_through_calls): Use
	actual_call_used_reg_set instead of call_used_reg_set, if available.

From-SVN: r221448

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7f7297fe7694e346730e797ac0c858ab009923ce..1348db5a01f8b9c87634806d001c9c5127adae39 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2015-03-16  Tom de Vries  <tom@codesourcery.com>
+
+       PR middle-end/65414
+       Revert:
+       2015-03-12  Tom de Vries  <tom@codesourcery.com>
+
+       PR rtl-optimization/64895
+       * lra-lives.c (check_pseudos_live_through_calls): Use
+       actual_call_used_reg_set instead of call_used_reg_set, if available.
+
 2015-03-16  Alan Modra  <amodra@gmail.com>
 
        PR target/63150

diff --git a/gcc/lra-lives.c b/gcc/lra-lives.c
index 5d759ca73d3d1ce55faf9c0522366edc55582b46..9dfffb6f28788b22df01b9922faa8463065bee04 100644 (file)
--- a/gcc/lra-lives.c
+++ b/gcc/lra-lives.c
@@ -636,12 +636,8 @@ check_pseudos_live_through_calls (int regno)
   if (! sparseset_bit_p (pseudos_live_through_calls, regno))
     return;
   sparseset_clear_bit (pseudos_live_through_calls, regno);
-  bool actual_call_used_reg_set_available_p
-    = !hard_reg_set_empty_p (lra_reg_info[regno].actual_call_used_reg_set);
   IOR_HARD_REG_SET (lra_reg_info[regno].conflict_hard_regs,
-                   (actual_call_used_reg_set_available_p
-                    ? lra_reg_info[regno].actual_call_used_reg_set
-                    : call_used_reg_set));
+                   call_used_reg_set);
 
   for (hr = 0; hr < FIRST_PSEUDO_REGISTER; hr++)
     if (HARD_REGNO_CALL_PART_CLOBBERED (hr, PSEUDO_REGNO_MODE (regno)))