* @author Beyhan Veliev, Michael Beck
* @version $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <string.h>
#include "iroptimize.h"
#include "scalar_replace.h"
+#include "opt_init.h"
#include "irflag_t.h"
#include "irouts.h"
#include "set.h"
#include "irgwalk.h"
#include "irgmod.h"
#include "irnode_t.h"
+#include "irpass.h"
#include "irtools.h"
#include "xmalloc.h"
#include "debug.h"
typedef struct _scalars_t {
ir_entity *ent; /**< A entity for scalar replacement. */
- ir_type *ent_owner; /**< The owner of this entity. */
} scalars_t;
DEBUG_ONLY(static firm_dbg_module_t *dbg;)
*
* @return 0 if they are identically
*/
-static int path_cmp(const void *elt, const void *key, size_t size) {
+static int path_cmp(const void *elt, const void *key, size_t size)
+{
const path_t *p1 = elt;
const path_t *p2 = key;
(void) size;
*
* @return 0 if they are identically
*/
-static int ent_cmp(const void *elt, const void *key, size_t size) {
+static int ent_cmp(const void *elt, const void *key, size_t size)
+{
const scalars_t *c1 = elt;
const scalars_t *c2 = key;
(void) size;
/**
* Calculate a hash value for a path.
*/
-static unsigned path_hash(const path_t *path) {
+static unsigned path_hash(const path_t *path)
+{
unsigned hash = 0;
unsigned i;
*
* @param sel the Sel node that will be checked
*/
-static int is_const_sel(ir_node *sel) {
+static int is_const_sel(ir_node *sel)
+{
int i, n = get_Sel_n_indexs(sel);
for (i = 0; i < n; ++i) {
ir_node *idx = get_Sel_index(sel, i);
- if (get_irn_op(idx) != op_Const)
+ if (!is_Const(idx))
return 0;
}
return 1;
* @param mode the mode of the Load/Store
* @param ent_mode the mode of the accessed entity
*/
-static int check_load_store_mode(ir_mode *mode, ir_mode *ent_mode) {
+static int check_load_store_mode(ir_mode *mode, ir_mode *ent_mode)
+{
if (ent_mode != mode) {
if (ent_mode == NULL ||
get_mode_size_bits(ent_mode) != get_mode_size_bits(mode) ||
*/
int is_address_taken(ir_node *sel)
{
- int i;
- ir_mode *emode, *mode;
- ir_node *value;
+ int i, input_nr, k;
+ ir_mode *emode, *mode;
+ ir_node *value;
ir_entity *ent;
if (! is_const_sel(sel))
switch (get_irn_opcode(succ)) {
case iro_Load:
+ /* do not remove volatile variables */
+ if (get_Load_volatility(succ) == volatility_is_volatile)
+ return 1;
/* check if this load is not a hidden conversion */
mode = get_Load_mode(succ);
ent = get_Sel_entity(sel);
emode = get_type_mode(get_entity_type(ent));
if (! check_load_store_mode(mode, emode))
return 1;
- /* do not remove volatile variables */
- if (get_Load_volatility(succ) == volatility_is_volatile)
- return 1;
break;
case iro_Store:
value = get_Store_value(succ);
if (value == sel)
return 1;
+ /* do not remove volatile variables */
+ if (get_Store_volatility(succ) == volatility_is_volatile)
+ return 1;
/* check if this Store is not a hidden conversion */
mode = get_irn_mode(value);
ent = get_Sel_entity(sel);
emode = get_type_mode(get_entity_type(ent));
if (! check_load_store_mode(mode, emode))
return 1;
- /* do not remove volatile variables */
- if (get_Store_volatility(succ) == volatility_is_volatile)
- return 1;
break;
case iro_Sel: {
- /* Check the Sel successor of Sel */
- int res = is_address_taken(succ);
+ int res;
+ ir_entity *entity = get_Sel_entity(succ);
+ /* we can't handle unions correctly yet -> address taken */
+ if (is_Union_type(get_entity_owner(entity)))
+ return 1;
+ /* Check the Sel successor of Sel */
+ res = is_address_taken(succ);
if (res)
return 1;
break;
*/
return 1;
+ case iro_Id: {
+ int res = is_address_taken(succ);
+ if (res)
+ return 1;
+ break;
+ }
+
+ case iro_Tuple:
+ /* Non-optimized Tuple, happens in inlining */
+ for (input_nr = get_Tuple_n_preds(succ) - 1; input_nr >= 0; --input_nr) {
+ ir_node *pred = get_Tuple_pred(succ, input_nr);
+
+ if (pred == sel) {
+ /* we found one input */
+ for (k = get_irn_n_outs(succ) - 1; k >= 0; --k) {
+ ir_node *proj = get_irn_out(succ, k);
+
+ if (is_Proj(proj) && get_Proj_proj(proj) == input_nr) {
+ int res = is_address_taken(proj);
+ if (res)
+ return 1;
+ }
+ }
+ }
+ }
+ break;
+
default:
/* another op, the address is taken */
return 1;
* @param ent the entity that will be scalar replaced
* @param sel a Sel node that selects some fields of this entity
*/
-static void link_all_leave_sels(ir_entity *ent, ir_node *sel) {
- int i, n, flag = 1;
+static int link_all_leave_sels(ir_entity *ent, ir_node *sel)
+{
+ int i, is_leave = 1;
- n = get_irn_n_outs(sel);
- for (i = 0; i < n; ++i) {
+ for (i = get_irn_n_outs(sel) - 1; i >= 0; --i) {
ir_node *succ = get_irn_out(sel, i);
if (is_Sel(succ)) {
+ /* the current leave has further Sel's, no leave */
+ is_leave = 0;
link_all_leave_sels(ent, succ);
- flag = 0;
+ } else if (is_Id(succ)) {
+ is_leave &= link_all_leave_sels(ent, succ);
}
}
- if (flag) {
- /* if Sel nodes with memory inputs are used, a entity can be
- * visited more than once causing a ring here, so we use the
- * node flag to mark linked nodes
- */
- if (irn_visited(sel))
- return;
+ if (is_leave) {
+ /* beware of Id's */
+ sel = skip_Id(sel);
/* we know we are at a leave, because this function is only
- * called if the address is NOT taken, so succ must be a Load
- * or a Store node
+ * called if the address is NOT taken, so sel's successor(s)
+ * must be Loads or Stores
*/
set_irn_link(sel, get_entity_link(ent));
set_entity_link(ent, sel);
-
- mark_irn_visited(sel);
}
+ return is_leave;
}
/* we need a special address that serves as an address taken marker */
* @return non-zero if at least one entity could be replaced
* potentially
*/
-static int find_possible_replacements(ir_graph *irg) {
- ir_node *irg_frame = get_irg_frame(irg);
- int i, n;
- int res = 0;
-
- inc_irg_visited(irg);
-
- n = get_irn_n_outs(irg_frame);
+static int find_possible_replacements(ir_graph *irg)
+{
+ ir_node *irg_frame;
+ ir_type *frame_tp;
+ int i, j, k, static_link_arg;
+ int res = 0;
/*
* First, clear the link field of all interesting entities.
- * Note that we did not rely on the fact that there is only
- * one Sel node per entity, so we might access one entity
- * more than once here.
- * That's why we have need two loops.
*/
- for (i = 0; i < n; ++i) {
- ir_node *succ = get_irn_out(irg_frame, i);
+ frame_tp = get_irg_frame_type(irg);
+ for (i = get_class_n_members(frame_tp) - 1; i >= 0; --i) {
+ ir_entity *ent = get_class_member(frame_tp, i);
+ set_entity_link(ent, NULL);
+ }
- if (is_Sel(succ)) {
- ir_entity *ent = get_Sel_entity(succ);
- set_entity_link(ent, NULL);
+ /* check for inner functions:
+ * FIXME: need a way to get the argument position for the static link */
+ static_link_arg = 0;
+ for (i = get_class_n_members(frame_tp) - 1; i >= 0; --i) {
+ ir_entity *ent = get_class_member(frame_tp, i);
+ if (is_method_entity(ent)) {
+ ir_graph *inner_irg = get_entity_irg(ent);
+ ir_node *args;
+
+ assure_irg_outs(inner_irg);
+ args = get_irg_args(inner_irg);
+ for (j = get_irn_n_outs(args) - 1; j >= 0; --j) {
+ ir_node *arg = get_irn_out(args, j);
+
+ if (get_Proj_proj(arg) == static_link_arg) {
+ for (k = get_irn_n_outs(arg) - 1; k >= 0; --k) {
+ ir_node *succ = get_irn_out(arg, k);
+
+ if (is_Sel(succ)) {
+ ir_entity *ent = get_Sel_entity(succ);
+
+ if (get_entity_owner(ent) == frame_tp) {
+ /* found an access to the outer frame */
+ set_entity_link(ent, ADDRESS_TAKEN);
+ }
+ }
+ }
+ }
+ }
}
}
* isn't a scalar replacement set the link of this entity
* equal ADDRESS_TAKEN.
*/
- for (i = 0; i < n; ++i) {
+ irg_frame = get_irg_frame(irg);
+ for (i = get_irn_n_outs(irg_frame) - 1; i >= 0; --i) {
ir_node *succ = get_irn_out(irg_frame, i);
if (is_Sel(succ)) {
ir_entity *ent = get_Sel_entity(succ);
ir_type *ent_type;
+ /* we are only interested in entities on the frame, NOT
+ on the value type */
+ if (get_entity_owner(ent) != frame_tp)
+ continue;
+
if (get_entity_link(ent) == ADDRESS_TAKEN)
continue;
/* we can handle arrays, structs and atomic types yet */
if (is_Array_type(ent_type) || is_Struct_type(ent_type) || is_atomic_type(ent_type)) {
if (is_address_taken(succ)) {
- if (get_entity_link(ent)) /* killing one */
+ /* killing one */
+ if (get_entity_link(ent))
--res;
set_entity_link(ent, ADDRESS_TAKEN);
} else {
* @param sel the Sel node
* @param len the length of the path so far
*/
-static path_t *find_path(ir_node *sel, unsigned len) {
+static path_t *find_path(ir_node *sel, unsigned len)
+{
int pos, i, n;
path_t *res;
ir_node *pred = get_Sel_ptr(sel);
if (! is_Sel(pred)) {
/* we found the root */
-
- res = xmalloc(sizeof(*res) + (len - 1) * sizeof(res->path));
+ res = XMALLOCF(path_t, path, len);
res->path_len = len;
} else
res = find_path(pred, len);
path_t *key, *path;
set *pathes = new_set(path_cmp, 8);
+ DB((dbg, SET_LEVEL_3, " Visiting Sel nodes of entity %+F\n", ent));
/* visit all Sel nodes in the chain of the entity */
for (sel = get_entity_link(ent); sel; sel = next) {
next = get_irn_link(sel);
key = find_path(sel, 0);
path = set_find(pathes, key, PATH_SIZE(key), path_hash(key));
- if (path)
+ if (path) {
SET_VNUM(sel, path->vnum);
- else {
+ DB((dbg, SET_LEVEL_3, " %+F represents value %u\n", sel, path->vnum));
+ } else {
key->vnum = vnum++;
set_insert(pathes, key, PATH_SIZE(key), path_hash(key));
SET_VNUM(sel, key->vnum);
+ DB((dbg, SET_LEVEL_3, " %+F represents value %u\n", sel, key->vnum));
+
ARR_EXTO(ir_mode *, *modes, (int)((key->vnum + 15) & ~15));
(*modes)[key->vnum] = get_type_mode(get_entity_type(get_Sel_entity(sel)));
* environment for memory walker
*/
typedef struct _env_t {
- struct obstack obst; /**< a obstack for the value blocks */
int nvals; /**< number of values */
ir_mode **modes; /**< the modes of the values */
- list_entry_t *fix_phis; /**< list of all Phi nodes that must be fixed */
- list_entry_t *fix_loads; /**< list of all Load nodes that must be fixed */
pset *sels; /**< A set of all Sel nodes that have a value number */
} env_t;
/**
- * topological walker.
+ * topological post-walker.
*/
-static void topologic_walker(ir_node *node, void *ctx) {
+static void topologic_walker(ir_node *node, void *ctx)
+{
env_t *env = ctx;
- ir_op *op = get_irn_op(node);
- ir_node *adr, *block, *mem, *unk, **value_arr, **in, *val;
+ ir_node *adr, *block, *mem, *val;
ir_mode *mode;
unsigned vnum;
- int i, j, n;
- list_entry_t *l;
- if (op == op_Load) {
+ if (is_Load(node)) {
/* a load, check if we can resolve it */
adr = get_Load_ptr(node);
- if (! is_Sel(adr))
+ DB((dbg, SET_LEVEL_3, " checking %+F for replacement ", node));
+ if (! is_Sel(adr)) {
+ DB((dbg, SET_LEVEL_3, "no Sel input (%+F)\n", adr));
return;
+ }
- if (! pset_find_ptr(env->sels, adr))
+ if (! pset_find_ptr(env->sels, adr)) {
+ DB((dbg, SET_LEVEL_3, "Sel %+F has no VNUM\n", adr));
return;
+ }
/* ok, we have a Load that will be replaced */
vnum = GET_VNUM(adr);
-
assert(vnum < (unsigned)env->nvals);
- block = get_nodes_block(node);
- value_arr = get_irn_link(block);
+ DB((dbg, SET_LEVEL_3, "replacing by value %u\n", vnum));
+
+ block = get_nodes_block(node);
+ set_cur_block(block);
/* check, if we can replace this Load */
- if (value_arr[vnum]) {
- mem = get_Load_mem(node);
-
- /* Beware: A Load can contain a hidden conversion in Firm.
- This happens for instance in the following code:
-
- int i;
- unsigned j = *(unsigned *)&i;
-
- Handle this here. */
- val = value_arr[vnum];
- mode = get_Load_mode(node);
- if (mode != get_irn_mode(val))
- val = new_d_Conv(get_irn_dbg_info(node), val, mode);
-
- turn_into_tuple(node, pn_Load_max);
- set_Tuple_pred(node, pn_Load_M, mem);
- set_Tuple_pred(node, pn_Load_res, val);
- set_Tuple_pred(node, pn_Load_X_regular, new_r_Jmp(current_ir_graph, block));
- set_Tuple_pred(node, pn_Load_X_except, new_Bad());
- } else {
- l = obstack_alloc(&env->obst, sizeof(*l));
- l->node = node;
- l->vnum = vnum;
+ val = get_value(vnum, env->modes[vnum]);
+
+ /* Beware: A Load can contain a hidden conversion in Firm.
+ This happens for instance in the following code:
+
+ int i;
+ unsigned j = *(unsigned *)&i;
+
+ Handle this here. */
+ mode = get_Load_mode(node);
+ if (mode != get_irn_mode(val))
+ val = new_d_Conv(get_irn_dbg_info(node), val, mode);
+
+ mem = get_Load_mem(node);
+ turn_into_tuple(node, pn_Load_max);
+ set_Tuple_pred(node, pn_Load_M, mem);
+ set_Tuple_pred(node, pn_Load_res, val);
+ set_Tuple_pred(node, pn_Load_X_regular, new_Jmp());
+ set_Tuple_pred(node, pn_Load_X_except, new_Bad());
+ } else if (is_Store(node)) {
+ DB((dbg, SET_LEVEL_3, " checking %+F for replacement ", node));
- set_irn_link(node, env->fix_loads);
- env->fix_loads = l;
- }
- } else if (op == op_Store) {
/* a Store always can be replaced */
adr = get_Store_ptr(node);
- if (! is_Sel(adr))
+ if (! is_Sel(adr)) {
+ DB((dbg, SET_LEVEL_3, "no Sel input (%+F)\n", adr));
return;
+ }
- if (! pset_find_ptr(env->sels, adr))
+ if (! pset_find_ptr(env->sels, adr)) {
+ DB((dbg, SET_LEVEL_3, "Sel %+F has no VNUM\n", adr));
return;
+ }
vnum = GET_VNUM(adr);
-
assert(vnum < (unsigned)env->nvals);
- block = get_nodes_block(node);
- value_arr = get_irn_link(block);
+ DB((dbg, SET_LEVEL_3, "replacing by value %u\n", vnum));
+
+ block = get_nodes_block(node);
+ set_cur_block(block);
/* Beware: A Store can contain a hidden conversion in Firm. */
val = get_Store_value(node);
if (get_irn_mode(val) != env->modes[vnum])
val = new_d_Conv(get_irn_dbg_info(node), val, env->modes[vnum]);
- value_arr[vnum] = val;
- mem = get_Store_mem(node);
- block = get_nodes_block(node);
+ set_value(vnum, val);
+ mem = get_Store_mem(node);
turn_into_tuple(node, pn_Store_max);
set_Tuple_pred(node, pn_Store_M, mem);
- set_Tuple_pred(node, pn_Store_X_regular, new_r_Jmp(current_ir_graph, block));
+ set_Tuple_pred(node, pn_Store_X_regular, new_Jmp());
set_Tuple_pred(node, pn_Store_X_except, new_Bad());
- } else if (op == op_Phi && get_irn_mode(node) == mode_M) {
- /*
- * found a memory Phi: Here, we must create new Phi nodes
- */
- block = get_nodes_block(node);
- value_arr = get_irn_link(block);
-
- n = get_Block_n_cfgpreds(block);
-
- in = alloca(sizeof(*in) * n);
-
- for (i = env->nvals - 1; i >= 0; --i) {
- unk = new_Unknown(env->modes[i]);
- for (j = n - 1; j >= 0; --j)
- in[j] = unk;
-
- value_arr[i] = new_r_Phi(current_ir_graph, block, n, in, env->modes[i]);
-
- l = obstack_alloc(&env->obst, sizeof(*l));
- l->node = value_arr[i];
- l->vnum = i;
-
- set_irn_link(value_arr[i], env->fix_phis);
- env->fix_phis = l;
- }
}
}
/**
- * Walker: allocate the value array for every block.
- */
-static void alloc_value_arr(ir_node *block, void *ctx) {
- env_t *env = ctx;
- ir_node **var_arr = obstack_alloc(&env->obst, sizeof(*var_arr) * env->nvals);
-
- /* the value array is empty at start */
- memset(var_arr, 0, sizeof(*var_arr) * env->nvals);
- set_irn_link(block, var_arr);
-}
-
-/**
- * searches through blocks beginning from block for value
- * vnum and return it.
- */
-static ir_node *find_vnum_value(ir_node *block, unsigned vnum) {
- ir_node **value_arr;
- int i;
- ir_node *res;
-
- if (Block_not_block_visited(block)) {
- mark_Block_block_visited(block);
-
- value_arr = get_irn_link(block);
-
- if (value_arr[vnum])
- return value_arr[vnum];
-
- for (i = get_Block_n_cfgpreds(block) - 1; i >= 0; --i) {
- ir_node *pred = get_Block_cfgpred(block, i);
-
- res = find_vnum_value(get_nodes_block(pred), vnum);
- if (res)
- return res;
- }
- }
- return NULL;
-}
-
-/**
- * fix the Phi list
- */
-static void fix_phis(env_t *env) {
- list_entry_t *l;
- ir_node *phi, *block, *pred, *val;
- int i;
-
- for (l = env->fix_phis; l; l = get_irn_link(phi)) {
- phi = l->node;
-
- block = get_nodes_block(phi);
- for (i = get_irn_arity(phi) - 1; i >= 0; --i) {
- pred = get_Block_cfgpred(block, i);
- pred = get_nodes_block(pred);
-
- inc_irg_block_visited(current_ir_graph);
- val = find_vnum_value(pred, l->vnum);
-
- if (val)
- set_irn_n(phi, i, val);
- }
- }
-}
-
-/**
- * fix the Load list
- */
-static void fix_loads(env_t *env) {
- list_entry_t *l;
- ir_node *load, *block, *pred, *val = NULL, *mem;
- ir_mode *mode;
- int i;
-
- for (l = env->fix_loads; l; l = get_irn_link(load)) {
- load = l->node;
-
- block = get_nodes_block(load);
- for (i = get_Block_n_cfgpreds(block) - 1; i >= 0; --i) {
- pred = get_Block_cfgpred(block, i);
- pred = get_nodes_block(pred);
-
- inc_irg_block_visited(current_ir_graph);
- val = find_vnum_value(pred, l->vnum);
-
- if (val)
- break;
- }
-
- if (! val) {
- /* access of an uninitialized value */
- val = new_Unknown(env->modes[l->vnum]);
- }
-
- /* Beware: A Load can contain a hidden conversion in Firm.
- Handle this here. */
- mode = get_Load_mode(load);
- if (mode != get_irn_mode(val))
- val = new_d_Conv(get_irn_dbg_info(load), val, mode);
-
- mem = get_Load_mem(load);
-
- turn_into_tuple(load, pn_Load_max);
- set_Tuple_pred(load, pn_Load_M, mem);
- set_Tuple_pred(load, pn_Load_res, val);
- set_Tuple_pred(load, pn_Load_X_regular, new_r_Jmp(current_ir_graph, block));
- set_Tuple_pred(load, pn_Load_X_except, new_Bad());
- }
-}
-
-/**
- * Make scalar replacement.
+ * Make scalar replacement.
*
* @param sels A set containing all Sel nodes that have a value number
* @param nvals The number of scalars.
* @param modes A flexible array, containing all the modes of
* the value numbers.
*/
-static void do_scalar_replacements(pset *sels, int nvals, ir_mode **modes) {
+static void do_scalar_replacements(pset *sels, int nvals, ir_mode **modes)
+{
env_t env;
- obstack_init(&env.obst);
+ ssa_cons_start(current_ir_graph, nvals);
+
env.nvals = nvals;
env.modes = modes;
- env.fix_phis = NULL;
- env.fix_loads = NULL;
env.sels = sels;
- /* first step: allocate the value arrays for every block */
- irg_block_walk_graph(current_ir_graph, NULL, alloc_value_arr, &env);
-
/*
* second step: walk over the graph blockwise in topological order
* and fill the array as much as possible.
*/
+ DB((dbg, SET_LEVEL_3, "Substituting Loads and Stores in %+F\n", current_ir_graph));
irg_walk_blkwise_graph(current_ir_graph, NULL, topologic_walker, &env);
- /* third, fix the list of Phis, then the list of Loads */
- fix_phis(&env);
- fix_loads(&env);
-
- obstack_free(&env.obst, NULL);
+ ssa_cons_finish(current_ir_graph);
}
/*
*
* @param irg The current ir graph.
*/
-void scalar_replacement_opt(ir_graph *irg) {
+int scalar_replacement_opt(ir_graph *irg)
+{
unsigned nvals;
int i;
scalars_t key, *value;
ir_mode **modes;
set *set_ent;
pset *sels;
- ir_type *ent_type;
+ ir_type *ent_type, *frame_tp;
ir_graph *rem;
-
- if (! get_opt_scalar_replacement())
- return;
+ int res = 0;
rem = current_ir_graph;
+ current_ir_graph = irg;
/* Call algorithm that computes the out edges */
assure_irg_outs(irg);
+ /* we use the link field to store the VNUM */
+ ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK);
+ irp_reserve_resources(irp, IR_RESOURCE_ENTITY_LINK);
+
/* Find possible scalar replacements */
if (find_possible_replacements(irg)) {
- DB((dbg, SET_LEVEL_1, "Scalar Replacement: %s\n", get_entity_name(get_irg_entity(irg))));
+ DB((dbg, SET_LEVEL_1, "Scalar Replacement: %+F\n", irg));
/* Insert in set the scalar replacements. */
irg_frame = get_irg_frame(irg);
- nvals = 0;
- modes = NEW_ARR_F(ir_mode *, 16);
- set_ent = new_set(ent_cmp, 8);
- sels = pset_new_ptr(8);
+ nvals = 0;
+ modes = NEW_ARR_F(ir_mode *, 16);
+ set_ent = new_set(ent_cmp, 8);
+ sels = pset_new_ptr(8);
+ frame_tp = get_irg_frame_type(irg);
- for (i = 0 ; i < get_irn_n_outs(irg_frame); i++) {
+ for (i = get_irn_n_outs(irg_frame) - 1; i >= 0; --i) {
ir_node *succ = get_irn_out(irg_frame, i);
if (is_Sel(succ)) {
ir_entity *ent = get_Sel_entity(succ);
+ /* we are only interested in entities on the frame, NOT
+ on the value type */
+ if (get_entity_owner(ent) != frame_tp)
+ continue;
+
if (get_entity_link(ent) == NULL || get_entity_link(ent) == ADDRESS_TAKEN)
continue;
ent_type = get_entity_type(ent);
key.ent = ent;
- key.ent_owner = get_entity_owner(ent);
set_insert(set_ent, &key, sizeof(key), HASH_PTR(key.ent));
#ifdef DEBUG_libfirm
do_scalar_replacements(sels, nvals, modes);
foreach_set(set_ent, value) {
- remove_class_member(value->ent_owner, value->ent);
+ free_entity(value->ent);
}
/*
*/
set_irg_outs_inconsistent(irg);
set_irg_loopinfo_inconsistent(irg);
+
+ res = 1;
}
del_pset(sels);
del_set(set_ent);
DEL_ARR_F(modes);
-
}
+ ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
+ irp_free_resources(irp, IR_RESOURCE_ENTITY_LINK);
+
current_ir_graph = rem;
+ return res;
}
-void firm_init_scalar_replace(void) {
+ir_graph_pass_t *scalar_replacement_opt_pass(const char *name)
+{
+ return def_graph_pass_ret(name ? name : "scalar_rep",
+ scalar_replacement_opt);
+}
+
+void firm_init_scalar_replace(void)
+{
FIRM_DBG_REGISTER(dbg, "firm.opt.scalar_replace");
}
projects / libfirm / blobdiff