X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firverify.c;h=4f6001acb2119b4ae93e96a3dc47da759cf25c04;hb=25313dd42cf428b81b32ca83296ef3dfac9702b7;hp=9f1ab5b2b346e640eb71ac21a4670e64f2010e61;hpb=dbace876fdfd81816e32cddb6c3671c5ec05a3c6;p=libfirm

diff --git a/ir/ir/irverify.c b/ir/ir/irverify.c
index 9f1ab5b2b..4f6001acb 100644
--- a/ir/ir/irverify.c
+++ b/ir/ir/irverify.c
@@ -1,20 +1,6 @@
 /*
- * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
- *
  * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
@@ -24,6 +10,7 @@
  */
 #include "config.h"
 
+#include "irnode_t.h"
 #include "irprog.h"
 #include "irop_t.h"
 #include "irgraph_t.h"
@@ -38,16 +25,8 @@
 #include "irnodeset.h"
 #include "ircons.h"
 
-/** if this flag is set, verify entity types in Load & Store nodes */
-static int verify_entities = 0;
-
 const char *firm_verify_failure_msg;
 
-void verify_enable_entity_tests(int enable)
-{
-	verify_entities = enable;
-}
-
 #ifndef NDEBUG
 
 /**
@@ -84,13 +63,7 @@ static void show_entity_failure(const ir_node *node)
 
 		if (ent) {
 			ir_type *ent_type = get_entity_owner(ent);
-
-			if (ent_type) {
-				ir_fprintf(stderr, "\nFIRM: irn_verify_irg() %+F::%s failed\n",
-				           ent_type, get_entity_name(ent));
-			} else {
-				fprintf(stderr, "\nFIRM: irn_verify_irg() <NULL>::%s failed\n", get_entity_name(ent));
-			}
+			ir_fprintf(stderr, "\nFIRM: irn_verify_irg() %+F::%s failed\n", ent_type, get_entity_name(ent));
 		} else {
 			fprintf(stderr, "\nFIRM: irn_verify_irg() <IRG %p> failed\n", (void *)irg);
 		}
@@ -200,26 +173,6 @@ static void show_proj_mode_failure(const ir_node *n, ir_type *ty)
 		get_mode_name_ex(m));
 }
 
-/**
- * Prints a failure message for a proj
- */
-static void show_proj_failure_ent(const ir_node *n, ir_entity *ent)
-{
-	ir_node *op  = get_Proj_pred(n);
-	int proj     = get_Proj_proj(n);
-	ir_mode *m   = get_type_mode(get_entity_type(ent));
-	char type_name[256];
-	ir_print_type(type_name, sizeof(type_name), get_entity_type(ent));
-
-	show_entity_failure(n);
-	fprintf(stderr, "  node %ld %s%s %d(%s%s) entity %s(type %s mode %s)failed\n" ,
-		get_irn_node_nr(n),
-		get_irn_opname(n), get_irn_modename(n), proj,
-		get_irn_opname(op), get_irn_modename(op),
-		get_entity_name(ent), type_name,
-		get_mode_name_ex(m));
-}
-
 /**
  * Show a node and a graph
  */
@@ -233,18 +186,19 @@ static void show_node_on_graph(const ir_graph *irg, const ir_node *n)
  */
 static void show_call_param(const ir_node *n, ir_type *mt)
 {
-	size_t i;
 	char type_name[256];
 	ir_print_type(type_name, sizeof(type_name), mt);
 
 	show_entity_failure(n);
 	fprintf(stderr, "  Call type-check failed: %s(", type_name);
-	for (i = 0; i < get_method_n_params(mt); ++i) {
+	size_t n_method_params = get_method_n_params(mt);
+	for (size_t i = 0; i < n_method_params; ++i) {
 		fprintf(stderr, "%s ", get_mode_name_ex(get_type_mode(get_method_param_type(mt, i))));
 	}
 	fprintf(stderr, ") != CALL(");
 
-	for (i = 0; i < get_Call_n_params(n); ++i) {
+	int n_params = get_Call_n_params(n);
+	for (int i = 0; i < n_params; ++i) {
 		fprintf(stderr, "%s ", get_mode_name_ex(get_irn_mode(get_Call_param(n, i))));
 	}
 	fprintf(stderr, ")\n");
@@ -305,21 +259,6 @@ static void show_phi_inputs(const ir_node *phi, const ir_node *block)
 
 #endif /* #ifndef NDEBUG */
 
-/**
- * If the address is Sel or SymConst, return the entity.
- *
- * @param ptr  the node representing the address
- */
-static ir_entity *get_ptr_entity(const ir_node *ptr)
-{
-	if (is_Sel(ptr)) {
-		return get_Sel_entity(ptr);
-	} else if (is_SymConst_addr_ent(ptr)) {
-		return get_SymConst_entity(ptr);
-	}
-	return NULL;
-}
-
 /**
  * verify a Proj(Start) node
  */
@@ -452,7 +391,7 @@ static int verify_node_Proj_Div(const ir_node *p)
 			(proj == pn_Div_M         && mode == mode_M) ||
 			(proj == pn_Div_X_regular && mode == mode_X) ||
 			(proj == pn_Div_X_except  && mode == mode_X) ||
-			(proj == pn_Div_res       && mode_is_data(mode) && mode == get_Div_resmode(n))
+			(proj == pn_Div_res       && mode == get_Div_resmode(n))
 		),
 		"wrong Proj from Div", 0,
 		show_proj_failure(p);
@@ -516,27 +455,12 @@ static int verify_node_Proj_Load(const ir_node *p)
 	long proj     = get_Proj_proj(p);
 
 	if (proj == pn_Load_res) {
-		ir_node   *ptr = get_Load_ptr(n);
-		ir_entity *ent = get_ptr_entity(ptr);
-		ir_graph  *irg = get_irn_irg(n);
-
-		if (verify_entities && ent && get_irg_phase_state(irg) == phase_high) {
-			/* do NOT check this for lowered phases, see comment on Store */
-			ASSERT_AND_RET_DBG(
-				(mode == get_type_mode(get_entity_type(ent))),
-				"wrong data Proj from Load, entity type_mode failed", 0,
-				show_proj_failure_ent(p, ent);
-			);
-		}
-		else {
-			ASSERT_AND_RET_DBG(
-				mode_is_data(mode) && mode == get_Load_mode(n),
-				"wrong data Proj from Load", 0,
-				show_proj_failure(p);
-			);
-		}
-	}
-	else {
+		ASSERT_AND_RET_DBG(
+			mode_is_data(mode) && mode == get_Load_mode(n),
+			"wrong data Proj from Load", 0,
+			show_proj_failure(p);
+		);
+	} else {
 		ASSERT_AND_RET_DBG(
 			(
 				(proj == pn_Load_M         && mode == mode_M) ||
@@ -615,18 +539,16 @@ static int verify_node_Proj_Alloc(const ir_node *p)
  */
 static int verify_node_Proj_Proj(const ir_node *p)
 {
-	ir_mode *mode = get_irn_mode(p);
-	ir_node *pred = get_Proj_pred(p);
-	long proj     = get_Proj_proj(p);
-	long nr       = get_Proj_proj(pred);
-	ir_type *mt; /* A method type */
-
-	pred = skip_Id(get_Proj_pred(pred));
-	ASSERT_AND_RET((get_irn_mode(pred) == mode_T), "Proj from something not a tuple", 0);
+	ir_mode *mode     = get_irn_mode(p);
+	ir_node *pred     = get_Proj_pred(p);
+	ir_node *predpred = get_Proj_pred(pred);
+	long     proj     = get_Proj_proj(p);
+	long     nr       = get_Proj_proj(pred);
 
-	switch (get_irn_opcode(pred)) {
-	case iro_Start:
-		mt = get_entity_type(get_irg_entity(get_irn_irg(pred)));
+	switch (get_irn_opcode(predpred)) {
+	case iro_Start:;
+		ir_graph *irg = get_irn_irg(p);
+		ir_type  *mt  = get_entity_type(get_irg_entity(irg));
 
 		if (nr == pn_Start_T_args) {
 			ASSERT_AND_RET(
@@ -636,12 +558,10 @@ static int verify_node_Proj_Proj(const ir_node *p)
 				(proj < (int)get_method_n_params(mt)),
 				"More Projs for args than args in type", 0
 				);
-			if ((mode_is_reference(mode)) && is_compound_type(get_method_param_type(mt, proj)))
-				/* value argument */ break;
-
-			if (get_irg_phase_state(get_irn_irg(pred)) != phase_backend) {
+			ir_type *param_type = get_method_param_type(mt, proj);
+			if (!irg_is_constrained(irg, IR_GRAPH_CONSTRAINT_BACKEND)) {
 				ASSERT_AND_RET_DBG(
-						(mode == get_type_mode(get_method_param_type(mt, proj))),
+						(mode == get_type_mode(param_type)),
 						"Mode of Proj from Start doesn't match mode of param type.", 0,
 						show_proj_mode_failure(p, get_method_param_type(mt, proj));
 						);
@@ -654,16 +574,19 @@ static int verify_node_Proj_Proj(const ir_node *p)
 			ASSERT_AND_RET(
 				(proj >= 0 && mode_is_datab(mode)),
 				"wrong Proj from Proj from Call", 0);
-			mt = get_Call_type(pred);
+			mt = get_Call_type(predpred);
 			ASSERT_AND_RET(is_unknown_type(mt) || is_Method_type(mt),
 					"wrong call type on call", 0);
 			ASSERT_AND_RET(
 				(proj < (int)get_method_n_ress(mt)),
 				"More Projs for results than results in type.", 0);
-			if ((mode_is_reference(mode)) && is_compound_type(get_method_res_type(mt, proj)))
-				/* value result */ break;
+			ir_type *res_type = get_method_res_type(mt, proj);
+			/* value result */
+			if ((mode_is_reference(mode)) &&
+				(is_compound_type(res_type) || is_Array_type(res_type)))
+				break;
 
-				ASSERT_AND_RET(
+			ASSERT_AND_RET(
 				(mode == get_type_mode(get_method_res_type(mt, proj))),
 				"Mode of Proj from Call doesn't match mode of result type.", 0);
 		}
@@ -719,28 +642,6 @@ static int verify_node_Proj_CopyB(const ir_node *p)
 	return 1;
 }
 
-/**
- * verify a Proj(Bound) node
- */
-static int verify_node_Proj_Bound(const ir_node *p)
-{
-	ir_mode *mode = get_irn_mode(p);
-	ir_node *n    = get_Proj_pred(p);
-	long proj     = get_Proj_proj(p);
-
-	ASSERT_AND_RET_DBG(
-		(
-			(proj == pn_Bound_M         && mode == mode_M) ||
-			(proj == pn_Bound_X_regular && mode == mode_X) ||
-			(proj == pn_Bound_X_except  && mode == mode_X) ||
-			(proj == pn_Bound_res       && mode == get_irn_mode(get_Bound_index(n)))
-		),
-		"wrong Proj from Bound", 0,
-		show_proj_failure(p);
-	);
-	return 1;
-}
-
 static int verify_node_Proj_fragile(const ir_node *node)
 {
 	ir_node *pred             = get_Proj_pred(node);
@@ -799,7 +700,7 @@ static int verify_node_Block(const ir_node *n)
 		ASSERT_AND_RET(get_Block_n_cfgpreds(n) == 0, "Start Block node", 0);
 	}
 
-	if (n == get_irg_end_block(irg) && get_irg_phase_state(irg) != phase_backend) {
+	if (n == get_irg_end_block(irg) && !irg_is_constrained(irg, IR_GRAPH_CONSTRAINT_BACKEND)) {
 		/* End block may only have Return, Raise or fragile ops as preds. */
 		for (i = get_Block_n_cfgpreds(n) - 1; i >= 0; --i) {
 			ir_node *pred =  skip_Proj(get_Block_cfgpred(n, i));
@@ -939,13 +840,13 @@ static int verify_node_Return(const ir_node *n)
 	ASSERT_AND_RET( mymode == mode_X, "Result X", 0 );   /* result X */
 	/* Compare returned results with result types of method type */
 	mt = get_entity_type(get_irg_entity(irg));
-	ASSERT_AND_RET_DBG(get_Return_n_ress(n) == get_method_n_ress(mt),
+	ASSERT_AND_RET_DBG((size_t)get_Return_n_ress(n) == get_method_n_ress(mt),
 		"Number of results for Return doesn't match number of results in type.", 0,
 		show_return_nres(irg, n, mt););
 	for (i = get_Return_n_ress(n) - 1; i >= 0; --i) {
 		ir_type *res_type = get_method_res_type(mt, i);
 
-		if (get_irg_phase_state(irg) != phase_backend) {
+		if (irg_is_constrained(irg, IR_GRAPH_CONSTRAINT_BACKEND)) {
 			if (is_atomic_type(res_type)) {
 				ASSERT_AND_RET_DBG(
 					get_irn_mode(get_Return_res(n, i)) == get_type_mode(res_type),
@@ -1015,6 +916,14 @@ static int verify_node_SymConst(const ir_node *n)
 		/* SymConst: BB --> ref */
 		mode_is_reference(mymode))
 		,"SymConst node", 0);
+	if (SYMCONST_HAS_ENT(get_SymConst_kind(n))) {
+		ir_entity *ent = get_SymConst_entity(n);
+		/* the is_method_entity(ent) exception is for nested functions... */
+		ASSERT_AND_RET_DBG((get_entity_owner(ent)->flags & tf_segment)
+		                   || is_method_entity(ent),
+		                   "SymConst node with non-segment entity", 0,
+		                   show_node_failure(n););
+	}
 	return 1;
 }
 
@@ -1040,6 +949,8 @@ static int verify_node_Sel(const ir_node *n)
 	}
 	ent = get_Sel_entity(n);
 	ASSERT_AND_RET_DBG(ent, "Sel node with empty entity", 0, show_node_failure(n););
+	ASSERT_AND_RET_DBG(!(get_entity_owner(ent)->flags & tf_segment),
+	                   "Sel node with global entity", 0, show_node_failure(n););
 	return 1;
 }
 
@@ -1108,7 +1019,7 @@ static int verify_node_Call(const ir_node *n)
 
 	if (get_method_variadicity(mt) == variadicity_variadic) {
 		ASSERT_AND_RET_DBG(
-			get_Call_n_params(n) >= get_method_n_params(mt),
+			(size_t)get_Call_n_params(n) >= get_method_n_params(mt),
 			"Number of args for Call doesn't match number of args in variadic type.",
 			0,
 			ir_fprintf(stderr, "Call %+F has %d params, type %d\n",
@@ -1116,7 +1027,7 @@ static int verify_node_Call(const ir_node *n)
 		);
 	} else {
 		ASSERT_AND_RET_DBG(
-			get_Call_n_params(n) == get_method_n_params(mt),
+			(size_t)get_Call_n_params(n) == get_method_n_params(mt),
 			"Number of args for Call doesn't match number of args in non variadic type.",
 			0,
 			ir_fprintf(stderr, "Call %+F has %d params, type %d\n",
@@ -1127,7 +1038,7 @@ static int verify_node_Call(const ir_node *n)
 	for (i = 0; i < get_method_n_params(mt); i++) {
 		ir_type *t = get_method_param_type(mt, i);
 
-		if (get_irg_phase_state(irg) != phase_backend) {
+		if (irg_is_constrained(irg, IR_GRAPH_CONSTRAINT_BACKEND)) {
 			if (is_atomic_type(t)) {
 				ASSERT_AND_RET_DBG(
 					get_irn_mode(get_Call_param(n, i)) == get_type_mode(t),
@@ -1269,12 +1180,14 @@ static int verify_node_Div(const ir_node *n)
 	ir_mode *op1mode = get_irn_mode(get_Div_mem(n));
 	ir_mode *op2mode = get_irn_mode(get_Div_left(n));
 	ir_mode *op3mode = get_irn_mode(get_Div_right(n));
+	ir_mode *resmode = get_Div_resmode(n);
 
 	ASSERT_AND_RET(
-		/* Div: BB x M x data x data --> M x X x data */
-		op1mode == mode_M &&
-		op2mode == op3mode &&
-		mode_is_data(op2mode) &&
+		/* Div: BB x M x num x num --> M x X x num */
+		op1mode == mode_M    &&
+		op2mode == resmode   &&
+		op3mode == resmode   &&
+		mode_is_num(resmode) &&
 		mymode == mode_T,
 		"Div node", 0
 		);
@@ -1290,12 +1203,14 @@ static int verify_node_Mod(const ir_node *n)
 	ir_mode *op1mode = get_irn_mode(get_Mod_mem(n));
 	ir_mode *op2mode = get_irn_mode(get_Mod_left(n));
 	ir_mode *op3mode = get_irn_mode(get_Mod_right(n));
+	ir_mode *resmode = get_Mod_resmode(n);
 
 	ASSERT_AND_RET(
 		/* Mod: BB x M x int x int --> M x X x int */
-		op1mode == mode_M &&
-		op2mode == op3mode &&
-		mode_is_int(op2mode) &&
+		op1mode == mode_M    &&
+		op2mode == resmode   &&
+		op3mode == resmode   &&
+		mode_is_int(resmode) &&
 		mymode == mode_T,
 		"Mod node", 0
 		);
@@ -1446,23 +1361,6 @@ static int verify_node_Conv(const ir_node *n)
 	return 1;
 }
 
-/**
- * verify a Cast node
- */
-static int verify_node_Cast(const ir_node *n)
-{
-	ir_mode *mymode  = get_irn_mode(n);
-	ir_mode *op1mode = get_irn_mode(get_Cast_op(n));
-
-	ASSERT_AND_RET_DBG(
-		/* Conv: BB x datab1 --> datab2 */
-		mode_is_data(op1mode) && op1mode == mymode,
-		"Cast node", 0,
-		show_unop_failure(n, "/* Conv: BB x datab1 --> datab2 */");
-	);
-	return 1;
-}
-
 /**
  * verify a Phi node
  */
@@ -1475,7 +1373,9 @@ static int verify_node_Phi(const ir_node *n)
 	/* a Phi node MUST have the same number of inputs as its block
 	 * Exception is a phi with 0 inputs which is used when (re)constructing the
 	 * SSA form */
-	if (! is_Bad(block) && get_irg_phase_state(get_irn_irg(n)) != phase_building && get_irn_arity(n) > 0) {
+	if (! is_Bad(block)
+	    && !irg_is_constrained(get_irn_irg(n), IR_GRAPH_CONSTRAINT_CONSTRUCTION)
+	    && get_irn_arity(n) > 0) {
 		ASSERT_AND_RET_DBG(
 			get_irn_arity(n) == get_irn_arity(block),
 			"wrong number of inputs in Phi node", 0,
@@ -1506,26 +1406,11 @@ static int verify_node_Load(const ir_node *n)
 	ir_mode  *op2mode = get_irn_mode(get_Load_ptr(n));
 
 	ASSERT_AND_RET(op1mode == mode_M, "Load node", 0);
-	if (get_irg_phase_state(irg) != phase_backend) {
+	if (!irg_is_constrained(irg, IR_GRAPH_CONSTRAINT_BACKEND)) {
 		ASSERT_AND_RET(mode_is_reference(op2mode), "Load node", 0 );
 	}
 	ASSERT_AND_RET( mymode == mode_T, "Load node", 0 );
 
-	/*
-	 * jack's gen_add_firm_code:simpleSel seems to build Load (Load
-	 * (Proj (Proj))) sometimes ...
-
-	 * interprete.c:ai_eval seems to assume that this happens, too
-
-	 * obset.c:get_abstval_any can't deal with this if the load has
-	 * mode_T
-	 *
-	  {
-	  ir_entity *ent = hunt_for_entity (get_Load_ptr (n), n);
-	  assert ((NULL != ent) || (mymode != mode_T));
-	  }
-	 */
-
 	return 1;
 }
 
@@ -1535,7 +1420,6 @@ static int verify_node_Load(const ir_node *n)
 static int verify_node_Store(const ir_node *n)
 {
 	ir_graph  *irg = get_irn_irg(n);
-	ir_entity *target;
 
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_Store_mem(n));
@@ -1543,22 +1427,11 @@ static int verify_node_Store(const ir_node *n)
 	ir_mode *op3mode = get_irn_mode(get_Store_value(n));
 
 	ASSERT_AND_RET(op1mode == mode_M && mode_is_datab(op3mode), "Store node", 0 );
-	if (get_irg_phase_state(irg) != phase_backend) {
+	if (!irg_is_constrained(irg, IR_GRAPH_CONSTRAINT_BACKEND)) {
 		ASSERT_AND_RET(mode_is_reference(op2mode), "Store node", 0 );
 	}
 	ASSERT_AND_RET(mymode == mode_T, "Store node", 0);
 
-	target = get_ptr_entity(get_Store_ptr(n));
-	if (verify_entities && target && get_irg_phase_state(irg) == phase_high) {
-		/*
-		 * If lowered code, any Sels that add 0 may be removed, causing
-		 * an direct access to entities of array or compound type.
-		 * Prevent this by checking the phase.
-		 */
-		ASSERT_AND_RET( op3mode == get_type_mode(get_entity_type(target)),
-			"Store node", 0);
-	}
-
 	return 1;
 }
 
@@ -1675,7 +1548,7 @@ static int verify_node_CopyB(const ir_node *n)
 
 	/* CopyB: BB x M x ref x ref --> M x X */
 	ASSERT_AND_RET(mymode == mode_T && op1mode == mode_M, "CopyB node", 0);
-	if (get_irg_phase_state(irg) != phase_backend) {
+	if (!irg_is_constrained(irg, IR_GRAPH_CONSTRAINT_BACKEND)) {
 		ASSERT_AND_RET(mode_is_reference(op2mode) && mode_is_reference(op3mode),
 			"CopyB node", 0 );
 	}
@@ -1690,28 +1563,6 @@ static int verify_node_CopyB(const ir_node *n)
 	return 1;
 }
 
-/**
- * verify a Bound node
- */
-static int verify_node_Bound(const ir_node *n)
-{
-	ir_mode *mymode  = get_irn_mode(n);
-	ir_mode *op1mode = get_irn_mode(get_Bound_mem(n));
-	ir_mode *op2mode = get_irn_mode(get_Bound_index(n));
-	ir_mode *op3mode = get_irn_mode(get_Bound_lower(n));
-	ir_mode *op4mode = get_irn_mode(get_Bound_upper(n));
-
-	/* Bound: BB x M x int x int x int --> M x X */
-	ASSERT_AND_RET(
-		mymode == mode_T &&
-		op1mode == mode_M &&
-		op2mode == op3mode &&
-		op3mode == op4mode &&
-		mode_is_int(op3mode),
-		"Bound node", 0 );
-	return 1;
-}
-
 /**
  * Check dominance.
  * For each usage of a node, it is checked, if the block of the
@@ -1810,6 +1661,12 @@ int irn_verify_irg(const ir_node *n, ir_graph *irg)
 		);
 	}
 
+	ASSERT_AND_RET_DBG(
+		!is_irn_start_block_placed(n) || get_nodes_block(n) == get_irg_start_block(irg),
+		"node should be in start block", 0,
+		ir_printf("node %+F", n);
+	);
+
 	if (op->ops.verify_node)
 		return op->ops.verify_node(n);
 
@@ -1891,7 +1748,7 @@ static int check_block_cfg(const ir_node *block, check_cfg_env_t *env)
 		branch = skip_Tuple(branch);
 		if (is_Bad(branch))
 			continue;
-		former_dest = pmap_get(branch_nodes, branch);
+		former_dest = pmap_get(ir_node, branch_nodes, branch);
 		ASSERT_AND_RET_DBG(former_dest==NULL || is_unknown_jump(skip_Proj(branch)),
 						   "Multiple users on mode_X node", 0,
 						   ir_printf("node %+F\n", branch);
@@ -1904,7 +1761,7 @@ static int check_block_cfg(const ir_node *block, check_cfg_env_t *env)
 		if (is_Proj(branch)) {
 			branch = skip_Proj(branch);
 		}
-		former_branch = pmap_get(branch_nodes, branch_block);
+		former_branch = pmap_get(ir_node, branch_nodes, branch_block);
 
 		ASSERT_AND_RET_DBG(former_branch == NULL || former_branch == branch,
 						   "Multiple branching nodes in a block", 0,
@@ -1939,7 +1796,7 @@ static void check_cfg_walk_func(ir_node *node, void *data)
 
 static int verify_block_branch(const ir_node *block, check_cfg_env_t *env)
 {
-	ir_node *branch = pmap_get(env->branch_nodes, block);
+	ir_node *branch = pmap_get(ir_node, env->branch_nodes, block);
 	ASSERT_AND_RET_DBG(branch != NULL
 	                   || ir_nodeset_contains(&env->kept_nodes, block)
 	                   || block == get_irg_end_block(get_irn_irg(block)),
@@ -2250,9 +2107,7 @@ void ir_register_verify_node_ops(void)
 	register_verify_node_func(op_Alloc,    verify_node_Alloc);
 	register_verify_node_func(op_And,      verify_node_And);
 	register_verify_node_func(op_Block,    verify_node_Block);
-	register_verify_node_func(op_Bound,    verify_node_Bound);
 	register_verify_node_func(op_Call,     verify_node_Call);
-	register_verify_node_func(op_Cast,     verify_node_Cast);
 	register_verify_node_func(op_Cmp,      verify_node_Cmp);
 	register_verify_node_func(op_Cond,     verify_node_Cond);
 	register_verify_node_func(op_Confirm,  verify_node_Confirm);
@@ -2290,7 +2145,6 @@ void ir_register_verify_node_ops(void)
 	register_verify_node_func(op_Sync,     verify_node_Sync);
 
 	register_verify_node_func_proj(op_Alloc,  verify_node_Proj_Alloc);
-	register_verify_node_func_proj(op_Bound,  verify_node_Proj_Bound);
 	register_verify_node_func_proj(op_Call,   verify_node_Proj_Call);
 	register_verify_node_func_proj(op_Cond,   verify_node_Proj_Cond);
 	register_verify_node_func_proj(op_CopyB,  verify_node_Proj_CopyB);