* gcc.dg/funcorder.c: Remove XFAIL for hppa*64*-*-*.

[pf3gnuchains/gcc-fork.git] / gcc / ira.c

diff --git a/gcc/ira.c b/gcc/ira.c
index e84230e..6db1fba 100644 (file)
--- a/gcc/ira.c
+++ b/gcc/ira.c
@@ -1915,8 +1915,12 @@ validate_equiv_mem (rtx start, rtx reg, rtx memref)
       if (find_reg_note (insn, REG_DEAD, reg))
        return 1;
 
-      if (CALL_P (insn) && ! MEM_READONLY_P (memref)
-         && ! RTL_CONST_OR_PURE_CALL_P (insn))
+      /* This used to ignore readonly memory and const/pure calls.  The problem
+        is the equivalent form may reference a pseudo which gets assigned a
+        call clobbered hard reg.  When we later replace REG with its
+        equivalent form, the value in the call-clobbered reg has been
+        changed and all hell breaks loose.  */
+      if (CALL_P (insn))
        return 0;
 
       note_stores (PATTERN (insn), validate_equiv_mem_from_store, NULL);
@@ -2581,7 +2585,13 @@ update_equiv_regs (void)
                  rtx equiv_insn;
 
                  if (! reg_equiv[regno].replace
-                     || reg_equiv[regno].loop_depth < loop_depth)
+                     || reg_equiv[regno].loop_depth < loop_depth
+                     /* There is no sense to move insns if we did
+                        register pressure-sensitive scheduling was
+                        done because it will not improve allocation
+                        but worsen insn schedule with a big
+                        probability.  */
+                     || (flag_sched_pressure && flag_schedule_insns))
                    continue;
 
                  /* reg_equiv[REGNO].replace gets set only when
@@ -3269,8 +3279,6 @@ ira (FILE *f)
 
   reload_completed = !reload (get_insns (), ira_conflicts_p);
 
-  finish_subregs_of_mode ();
-
   timevar_pop (TV_RELOAD);
 
   timevar_push (TV_IRA);