#endif
# include "irvrfy.h"
-# include "irflag.h"
+# include "irflag_t.h"
# include "irgwalk.h"
# include "irnode_t.h"
# include "irgraph_t.h"
INLINE void
exchange (ir_node *old, ir_node *nw)
{
- ir_node *block = old->in[0];
+ ir_node *block;
+
+ assert(get_irn_op(old)->opar != oparity_dynamic);
+
+ block = old->in[0];
old->op = op_Id;
old->in = NEW_ARR_D (ir_node *, current_ir_graph->obst, 2);
old->in[1] = nw;
}
-/**********************************************************************/
-/* Functionality for collect_phis */
-/**********************************************************************/
+/*--------------------------------------------------------------------*/
+/* Functionality for collect_phis */
+/*--------------------------------------------------------------------*/
static void
clear_link (ir_node *n, void *env) {
}
-/**********************************************************************/
-/* Funcionality for part_block */
-/**********************************************************************/
-
-/* Moves node and all predecessors of node from from_bl to to_bl.
- Does not move predecessors of Phi nodes (or block nodes). */
+/*--------------------------------------------------------------------*/
+/* Functionality for part_block */
+/*--------------------------------------------------------------------*/
+/**
+ * Moves node and all predecessors of node from from_bl to to_bl.
+ * Does not move predecessors of Phi nodes (or block nodes).
+ */
static void move (ir_node *node, ir_node *from_bl, ir_node *to_bl) {
int i;
ir_node *proj, *pred;
ir_node *phi;
/* Turn off optimizations so that blocks are not merged again. */
- int rem_opt = get_optimize();
+ int rem_opt = get_opt_optimize();
set_optimize(0);
/* Transform the control flow */