cg_callee_entry type holding the callee information is now explicit

[libfirm] / ir / lower / lower_intrinsics.c

diff --git a/ir/lower/lower_intrinsics.c b/ir/lower/lower_intrinsics.c
index 1ba2402..54abc9d 100644 (file)
--- a/ir/lower/lower_intrinsics.c
+++ b/ir/lower/lower_intrinsics.c
@@ -28,6 +28,7 @@
 #include "ircons.h"
 #include "irgmod.h"
 #include "irgopt.h"
+#include "trouts.h"
 #include "lower_intrinsics.h"
 #include "pmap.h"
 
@@ -35,7 +36,7 @@
 typedef struct _walker_env {
   pmap     *c_map;              /**< The intrinsic call map. */
   unsigned nr_of_intrinsics;    /**< statistics */
-  const i_instr_record **i_map; /**< The intrinsic instruction map. */
+  i_instr_record **i_map;       /**< The intrinsic instruction map. */
 } walker_env_t;
 
 /**
@@ -49,7 +50,7 @@ static void call_mapper(ir_node *node, void *env) {
     ir_node *symconst;
     pmap_entry *p;
     const i_call_record *r;
-    entity *ent;
+    ir_entity *ent;
 
     symconst = get_Call_ptr(node);
     if (get_irn_op(symconst) != op_SymConst ||
@@ -122,8 +123,12 @@ unsigned lower_intrinsics(i_record *list, int length) {
 
       /* exception control flow might have changed */
       set_irg_doms_inconsistent(irg);
+      set_irg_extblk_inconsistent(irg);
       set_irg_loopinfo_inconsistent(irg);
 
+      /* calls might be removed/added */
+      set_trouts_inconsistent();
+
       /* optimize it, tuple might be created */
       local_optimize_graph(irg);
 
@@ -262,6 +267,8 @@ int i_mapper_RuntimeCall(ir_node *node, runtime_rt *rt) {
 
   if (n_res > 0)
     res_proj = new_r_Proj(irg, bl, call, mode_T, pn_Call_T_result);
+  else
+    res_proj = NULL;
 
   if (n_proj > 0) {
     n_proj += n_res - 1;