X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flower%2Flower_intrinsics.c;h=f64c03953c0d3deb5a98b2a170620084e2f299d0;hb=45ecc187cee7107c83c1f9618a1e1e586df73644;hp=bf97301a8ae2da132ac9d67b4f0408298a562d2a;hpb=0eb058c40fdac19d33c1d2373bdbf8f7267aa407;p=libfirm

diff --git a/ir/lower/lower_intrinsics.c b/ir/lower/lower_intrinsics.c
index bf97301a8..f64c03953 100644
--- a/ir/lower/lower_intrinsics.c
+++ b/ir/lower/lower_intrinsics.c
@@ -40,7 +40,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 +691,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 +949,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));