fixed phi spilling

[libfirm] / ir / be / bespillbelady.c

diff --git a/ir/be/bespillbelady.c b/ir/be/bespillbelady.c
index 028d17b..b91c645 100644 (file)
--- a/ir/be/bespillbelady.c
+++ b/ir/be/bespillbelady.c
@@ -6,7 +6,7 @@
  *
  */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #ifdef HAVE_ALLOCA_H
@@ -377,6 +377,9 @@ static loc_t to_take_or_not_to_take(belady_env_t *env, ir_node* first,
                assert(is_Phi(node));
                loc.time = USES_INFINITY;
                DBG((dbg, DBG_START, "    %+F not taken (dead)\n", node));
+               if(is_Phi(node)) {
+                       be_spill_phi(env->senv, node);
+               }
                return loc;
        }
 
@@ -431,8 +434,6 @@ static void compute_live_ins(ir_node *block, void *data) {
                                ARR_APP1(loc_t, delayed, loc);
                        else
                                ARR_APP1(loc_t, starters, loc);
-               } else {
-                       be_spill_phi(env->senv, irn);
                }
        }
 
@@ -459,6 +460,16 @@ static void compute_live_ins(ir_node *block, void *data) {
        for (i = 0; i < ARR_LEN(delayed) && i < free_slots; ++i) {
                DBG((dbg, DBG_START, "    delayed %+F taken\n", delayed[i].irn));
                ARR_APP1(loc_t, starters, delayed[i]);
+               delayed[i].irn = NULL;
+       }
+
+       /* spill all delayed phis which didn't make it into start workset */
+       for (i = ARR_LEN(delayed) - 1; i >= 0; --i) {
+               ir_node *irn = delayed[i].irn;
+               if (irn && is_Phi(irn)) {
+                       DBG((dbg, DBG_START, "    spilling delayed phi %+F\n", irn));
+                       be_spill_phi(env->senv, irn);
+               }
        }
        DEL_ARR_F(delayed);