ia32: Prevent out-of-bounds access after calling emit_asm_operand().

[libfirm] / ir / be / belower.c

diff --git a/ir/be/belower.c b/ir/be/belower.c
index 4d934ac..b8a1d01 100644 (file)
--- a/ir/be/belower.c
+++ b/ir/be/belower.c
@@ -39,6 +39,7 @@
 #include "array_t.h"
 
 #include "bearch.h"
+#include "beirg.h"
 #include "belower.h"
 #include "benode.h"
 #include "besched.h"
@@ -506,7 +507,8 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
        ir_node                     *keep, *cpy;
        op_copy_assoc_t             *entry;
 
-       if (arch_irn_is_ignore(other_different) ||
+       arch_register_req_t const *const req = arch_get_irn_register_req(other_different);
+       if (arch_register_req_is(req, ignore) ||
                        !mode_is_datab(get_irn_mode(other_different))) {
                DB((dbg_constr, LEVEL_1, "ignore constraint for %+F because other_irn is ignore or not a datab node\n", irn));
                return;
@@ -514,7 +516,7 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
 
        op_set = &env->op_set;
        block  = get_nodes_block(irn);
-       cls    = arch_get_irn_reg_class(other_different);
+       cls    = req->cls;
 
        /* Make a not spillable copy of the different node   */
        /* this is needed because the different irn could be */
@@ -679,7 +681,6 @@ static void melt_copykeeps(constraint_env_t *cenv)
                        if (ck_arr[idx]) {
                                int j, n_melt;
                                ir_node **new_ck_in;
-                               ir_node *new_ck;
                                ir_node *sched_pt = NULL;
 
                                n_melt     = 1;
@@ -725,11 +726,9 @@ static void melt_copykeeps(constraint_env_t *cenv)
                                                kill_node(melt_arr[j]);
                                }
 
+                               ir_node *const new_ck = be_new_CopyKeep(get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in);
 #ifdef KEEP_ALIVE_COPYKEEP_HACK
-                               new_ck = be_new_CopyKeep(get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in);
                                keep_alive(new_ck);
-#else
-                               new_ck = be_new_CopyKeep(get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in);
 #endif /* KEEP_ALIVE_COPYKEEP_HACK */
 
                                /* set register class for all kept inputs */
@@ -885,7 +884,7 @@ found_front:
        n_moved = 0;
        for (;;) {
                ir_node *const node = sched_prev(perm);
-               if (sched_is_begin(node))
+               if (node == frontier)
                        break;
 
                const arch_register_req_t *req;
@@ -906,8 +905,6 @@ found_front:
                /* it wasn't an input to the perm, we can't do anything more */
                if (input < 0)
                        break;
-               if (!sched_comes_after(frontier, node))
-                       break;
                if (arch_irn_is(node, modify_flags))
                        break;
                req = arch_get_irn_register_req(node);