BugFix for a rare case:

[libfirm] / ir / lower / lower_intrinsics.c

diff --git a/ir/lower/lower_intrinsics.c b/ir/lower/lower_intrinsics.c
index bf97301..4cf7233 100644 (file)
--- a/ir/lower/lower_intrinsics.c
+++ b/ir/lower/lower_intrinsics.c
@@ -24,9 +24,7 @@
  * @version $Id$
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "lowering.h"
 #include "irop_t.h"
@@ -40,7 +38,7 @@
 #include "trouts.h"
 #include "irvrfy.h"
 #include "pmap.h"
-#include "xmalloc.h"
+#include "array_t.h"
 #include "iropt_dbg.h"
 
 /** Walker environment. */
@@ -691,9 +689,7 @@ int i_mapper_strcmp(ir_node *call, void *ctx) {
        ir_node   *irn     = NULL;
        ir_node   *exc     = NULL;
        ir_node   *reg     = NULL;
-       ir_node   *adr     = get_Call_ptr(call);
-       ir_entity *ent     = get_SymConst_entity(adr);
-       ir_type   *call_tp = get_entity_type(ent);
+       ir_type   *call_tp = get_Call_type(call);
        ir_type   *res_tp  = get_method_res_type(call_tp, 0);
        ir_entity *ent_l, *ent_r;
        ir_type   *char_tp;
@@ -951,7 +947,7 @@ int i_mapper_RuntimeCall(ir_node *node, runtime_rt *rt) {
                        set_Tuple_pred(node, i, new_r_Bad(irg));
                if (rt->mem_proj_nr >= 0)
                        set_Tuple_pred(node, rt->mem_proj_nr, new_r_Proj(irg, bl, call, mode_M, pn_Call_M_regular));
-               if (get_irn_op(mem) != op_NoMem) {
+               if (!is_NoMem(mem)) {
                        /* Exceptions can only be handled with real memory */
                        if (rt->regular_proj_nr >= 0)
                                set_Tuple_pred(node, rt->regular_proj_nr, new_r_Proj(irg, bl, call, mode_X, pn_Call_X_regular));