Use function_used_regs variable in collect_fn_hard_reg_usage

2014-06-20  Tom de Vries  <tom@codesourcery.com>

	* final.c (collect_fn_hard_reg_usage): Add and use variable
	function_used_regs.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 387d9dcfdb27ae26b6c098183216e766c7954837..e83b0ce18f358a5e1d4a4df423cc98a35d8f89bd 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-20  Tom de Vries  <tom@codesourcery.com>
+
+       * final.c (collect_fn_hard_reg_usage): Add and use variable
+       function_used_regs.
+
 2014-06-20  Jan Hubicka  <hubicka@ucw.cz>
 
        * cgraph.h (struct symtab_node): Add field in_init_priority_hash

diff --git a/gcc/final.c b/gcc/final.c
index 4f08073341632c98a53e4a5636f8a6199dd984d5..e39930d4207f2bce68e76b1aa1ec90daf0074d31 100644 (file)
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -4760,13 +4760,13 @@ collect_fn_hard_reg_usage (void)
   int i;
 #endif
   struct cgraph_rtl_info *node;
+  HARD_REG_SET function_used_regs;
 
   /* ??? To be removed when all the ports have been fixed.  */
   if (!targetm.call_fusage_contains_non_callee_clobbers)
     return;
 
-  node = cgraph_rtl_info (current_function_decl);
-  gcc_assert (node != NULL);
+  CLEAR_HARD_REG_SET (function_used_regs);
 
   for (insn = get_insns (); insn != NULL_RTX; insn = next_insn (insn))
     {
@@ -4779,25 +4779,26 @@ collect_fn_hard_reg_usage (void)
 
       if (CALL_P (insn)
          && !get_call_reg_set_usage (insn, &insn_used_regs, call_used_reg_set))
-       {
-         CLEAR_HARD_REG_SET (node->function_used_regs);
-         return;
-       }
+       return;
 
-      IOR_HARD_REG_SET (node->function_used_regs, insn_used_regs);
+      IOR_HARD_REG_SET (function_used_regs, insn_used_regs);
     }
 
   /* Be conservative - mark fixed and global registers as used.  */
-  IOR_HARD_REG_SET (node->function_used_regs, fixed_reg_set);
+  IOR_HARD_REG_SET (function_used_regs, fixed_reg_set);
 
 #ifdef STACK_REGS
   /* Handle STACK_REGS conservatively, since the df-framework does not
      provide accurate information for them.  */
 
   for (i = FIRST_STACK_REG; i <= LAST_STACK_REG; i++)
-    SET_HARD_REG_BIT (node->function_used_regs, i);
+    SET_HARD_REG_BIT (function_used_regs, i);
 #endif
 
+  node = cgraph_rtl_info (current_function_decl);
+  gcc_assert (node != NULL);
+
+  COPY_HARD_REG_SET (node->function_used_regs, function_used_regs);
   node->function_used_regs_valid = 1;
 }