Fix finding reg-sets of call insn

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

	* final.c (collect_fn_hard_reg_usage): Add separate IOR_HARD_REG_SET for
	get_call_reg_set_usage.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 108bc5f5b8a62147b755e1938568524afd29f7fa..ae42dcbea3b361b8baeb40ec5cf1792463562d04 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 separate IOR_HARD_REG_SET for
+       get_call_reg_set_usage.
+
 2014-06-20  Tom de Vries  <tom@codesourcery.com>
 
        * final.c (collect_fn_hard_reg_usage): Don't save function_used_regs if

diff --git a/gcc/final.c b/gcc/final.c
index e67e84b8a2e8c255cbfb79cb1d7310a37835d58e..bbeb50d072d8ec2463f32c813eaa3d29d78e4574 100644 (file)
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -4775,12 +4775,16 @@ collect_fn_hard_reg_usage (void)
       if (!NONDEBUG_INSN_P (insn))
        continue;
 
-      find_all_hard_reg_sets (insn, &insn_used_regs, false);
+      if (CALL_P (insn))
+       {
+         if (!get_call_reg_set_usage (insn, &insn_used_regs,
+                                      call_used_reg_set))
+           return;
 
-      if (CALL_P (insn)
-         && !get_call_reg_set_usage (insn, &insn_used_regs, call_used_reg_set))
-       return;
+         IOR_HARD_REG_SET (function_used_regs, insn_used_regs);
+       }
 
+      find_all_hard_reg_sets (insn, &insn_used_regs, false);
       IOR_HARD_REG_SET (function_used_regs, insn_used_regs);
     }