- BugFix: initialize memop->mem

[libfirm] / ir / opt / combo.c

diff --git a/ir/opt/combo.c b/ir/opt/combo.c
index f1c00fd..29b210c 100644 (file)
--- a/ir/opt/combo.c
+++ b/ir/opt/combo.c
@@ -288,7 +288,7 @@ static void check_opcode(const partition_t *Z) {
                                key.u.intVal = get_Conv_strict(irn);
                                break;
                        case iro_Div:
-                               key.u.intVal = is_Div_remainderless(irn);
+                               key.u.intVal = get_Div_no_remainder(irn);
                                break;
                        case iro_Block:
                                key.u.block = irn;
@@ -297,7 +297,7 @@ static void check_opcode(const partition_t *Z) {
                                key.mode = get_Load_mode(irn);
                                break;
                        case iro_Builtin:
-                               key.u.uintVal = get_Builtin_kind(irn);
+                               key.u.intVal = get_Builtin_kind(irn);
                                break;
                        default:
                                break;
@@ -319,7 +319,7 @@ static void check_opcode(const partition_t *Z) {
                                assert(key.u.intVal == get_Conv_strict(irn));
                                break;
                        case iro_Div:
-                               assert(key.u.intVal == is_Div_remainderless(irn));
+                               assert(key.u.intVal == get_Div_no_remainder(irn));
                                break;
                        case iro_Block:
                                assert(key.u.block == irn);
@@ -328,7 +328,7 @@ static void check_opcode(const partition_t *Z) {
                                assert(key.mode == get_Load_mode(irn));
                                break;
                        case iro_Builtin:
-                               assert(key.u.uintVal == get_Builtin_kind(irn));
+                               assert(key.u.intVal == (int) get_Builtin_kind(irn));
                                break;
                        default:
                                break;
@@ -1673,7 +1673,7 @@ static void *lambda_opcode(const node_t *node, environment_t *env) {
                key.u.intVal = get_Conv_strict(irn);
                break;
        case iro_Div:
-               key.u.intVal = is_Div_remainderless(irn);
+               key.u.intVal = get_Div_no_remainder(irn);
                break;
        case iro_Block:
                /*
@@ -1688,7 +1688,7 @@ static void *lambda_opcode(const node_t *node, environment_t *env) {
                key.mode = get_Load_mode(irn);
                break;
        case iro_Builtin:
-               key.u.uintVal = get_Builtin_kind(irn);
+               key.u.intVal = get_Builtin_kind(irn);
                break;
        default:
                break;
@@ -2376,7 +2376,7 @@ static void compute_Proj_Cond(node_t *node, ir_node *cond) {
                        node->type.tv = tarval_reachable;
                } else if (selector->type.tv == tarval_top) {
                        if (tarval_UNKNOWN == tarval_top &&
-                           pnc == get_Cond_defaultProj(cond)) {
+                           pnc == get_Cond_default_proj(cond)) {
                                /* a switch based of Top is always "default" */
                                node->type.tv = tarval_reachable;
                        } else {
@@ -2384,7 +2384,7 @@ static void compute_Proj_Cond(node_t *node, ir_node *cond) {
                        }
                } else {
                        long value = get_tarval_long(selector->type.tv);
-                       if (pnc == get_Cond_defaultProj(cond)) {
+                       if (pnc == get_Cond_default_proj(cond)) {
                                /* default switch, have to check ALL other cases */
                                int i;
 
@@ -3542,6 +3542,7 @@ void combo(ir_graph *irg) {
                set_irg_extblk_inconsistent(irg);
                set_irg_doms_inconsistent(irg);
                set_irg_loopinfo_inconsistent(irg);
+               set_irg_entity_usage_state(irg, ir_entity_usage_not_computed);
        }
 
        ir_free_resources(irg, IR_RESOURCE_IRN_LINK | IR_RESOURCE_PHI_LIST);