From 79df37c097fe8cfb7d8e56d30b658f7ce8f6655d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Christian=20Sch=C3=A4fer?=
 <schaefer@ipd.info.uni-karlsruhe.de>
Date: Thu, 6 Jul 2000 14:21:12 +0000
Subject: [PATCH] changed ir_vrfy and vrfy_graph to irn_vrfy and irg_vrfy!

[r32]
---
 ir/ir/ircons.c                     | 88 +++++++++++++++---------------
 ir/ir/irgwalk.c                    | 18 ++----
 ir/ir/iropt.c                      |  4 +-
 ir/ir/irvrfy.c                     |  6 +-
 ir/ir/irvrfy.h                     |  6 +-
 testprograms/array-heap_example.c  |  2 +-
 testprograms/array-stack_example.c |  2 +-
 testprograms/call_str_example.c    |  2 +-
 testprograms/cond_example.c        |  2 +-
 testprograms/const_eval_example.c  |  2 +-
 testprograms/dead_block_example.c  |  2 +-
 testprograms/empty.c               |  2 +-
 testprograms/global_var_example.c  |  2 +-
 testprograms/if_else_example.c     |  2 +-
 testprograms/if_example.c          |  2 +-
 testprograms/if_while_example.c    |  2 +-
 testprograms/irr_cf_example.c      |  2 +-
 testprograms/irr_loop_example.c    |  2 +-
 testprograms/memory_example.c      |  2 +-
 testprograms/oo_program_example.c  |  2 +-
 20 files changed, 71 insertions(+), 81 deletions(-)

diff --git a/ir/ir/ircons.c b/ir/ir/ircons.c
index a9938fc7d..e2a3c346e 100644
--- a/ir/ir/ircons.c
+++ b/ir/ir/ircons.c
@@ -51,7 +51,7 @@ new_r_Start (ir_graph *irg, ir_node *block)
 
   res = new_ir_node (irg, block, op_Start, mode_T, 0, NULL);
 
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -62,7 +62,7 @@ new_r_End (ir_graph *irg, ir_node *block)
 
   res = new_ir_node (irg, block, op_End, mode_X, -1, NULL);
 
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -76,7 +76,7 @@ new_r_Phi0 (ir_graph *irg, ir_node *block, ir_mode *mode)
 
   /* GL I'm not sure whether we should optimize this guy. *
      res = optimize (res); ??? */
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -93,7 +93,7 @@ new_r_Phi (ir_graph *irg, ir_node *block, int arity, ir_node **in, ir_mode *mode
   res = new_ir_node (irg, block, op_Phi, mode, arity, in);
 
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -228,7 +228,7 @@ new_r_Phi_in (ir_graph *irg, ir_node *block, ir_mode *mode,
     res = known;
   } else {
     res = optimize (res);
-    ir_vrfy (res);
+    irn_vrfy (res);
   }
 
   /* return the pointer to the Phi node.  This node might be deallocated! */
@@ -242,7 +242,7 @@ new_r_Const (ir_graph *irg, ir_node *block, ir_mode *mode, tarval *con)
   res = new_ir_node (irg, block, op_Const, mode, 0, NULL);
   res->attr.con = con;
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
 
 #if 0
   res = local_optimize_newby (res);
@@ -258,7 +258,7 @@ new_r_Id (ir_graph *irg, ir_node *block, ir_node *val, ir_mode *mode)
   ir_node *res;
   res = new_ir_node (irg, block, op_Id, mode, 1, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -277,7 +277,7 @@ new_r_Proj (ir_graph *irg, ir_node *block, ir_node *arg, ir_mode *mode,
 
   res = optimize (res);
 
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 
 }
@@ -289,7 +289,7 @@ new_r_Conv (ir_graph *irg, ir_node *block, ir_node *op, ir_mode *mode)
   ir_node *res;
   res = new_ir_node (irg, block, op_Conv, mode, 1, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 
 }
@@ -301,7 +301,7 @@ new_r_Tuple (ir_graph *irg, ir_node *block, int arity, ir_node **in)
 
   res = new_ir_node (irg, block, op_Tuple, mode_T, arity, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -313,7 +313,7 @@ new_r_Add (ir_graph *irg, ir_node *block,
   ir_node *res;
   res = new_ir_node (irg, block, op_Add, mode, 2, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -325,7 +325,7 @@ new_r_Sub (ir_graph *irg, ir_node *block,
   ir_node *res;
   res = new_ir_node (irg, block, op_Sub, mode, 2, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -337,7 +337,7 @@ new_r_Minus (ir_graph *irg, ir_node *block,
   ir_node *res;
   res = new_ir_node (irg, block, op_Minus, mode, 1, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -349,7 +349,7 @@ new_r_Mul (ir_graph *irg, ir_node *block,
   ir_node *res;
   res = new_ir_node (irg, block, op_Mul, mode, 2, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -361,7 +361,7 @@ new_r_Quot (ir_graph *irg, ir_node *block,
   ir_node *res;
   res = new_ir_node (irg, block, op_Quot, mode_T, 3, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -373,7 +373,7 @@ new_r_DivMod (ir_graph *irg, ir_node *block,
   ir_node *res;
   res = new_ir_node (irg, block, op_DivMod, mode_T, 3, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -385,7 +385,7 @@ new_r_Div (ir_graph *irg, ir_node *block,
   ir_node *res;
   res = new_ir_node (irg, block, op_Div, mode_T, 3, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -397,7 +397,7 @@ new_r_Mod (ir_graph *irg, ir_node *block,
   ir_node *res;
   res = new_ir_node (irg, block, op_Mod, mode_T, 3, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -409,7 +409,7 @@ new_r_And (ir_graph *irg, ir_node *block,
   ir_node *res;
   res = new_ir_node (irg, block, op_And, mode, 2, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -421,7 +421,7 @@ new_r_Or (ir_graph *irg, ir_node *block,
   ir_node *res;
   res = new_ir_node (irg, block, op_Or, mode, 2, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -433,7 +433,7 @@ new_r_Eor (ir_graph *irg, ir_node *block,
   ir_node *res;
   res = new_ir_node (irg, block, op_Eor, mode, 2, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -445,7 +445,7 @@ new_r_Not    (ir_graph *irg, ir_node *block,
   ir_node *res;
   res = new_ir_node (irg, block, op_Not, mode, 1, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -457,7 +457,7 @@ new_r_Shl (ir_graph *irg, ir_node *block,
   ir_node *res;
   res = new_ir_node (irg, block, op_Shl, mode, 2, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -469,7 +469,7 @@ new_r_Shr (ir_graph *irg, ir_node *block,
   ir_node *res;
   res = new_ir_node (irg, block, op_Shr, mode, 2, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -481,7 +481,7 @@ new_r_Shrs (ir_graph *irg, ir_node *block,
   ir_node *res;
   res = new_ir_node (irg, block, op_Shrs, mode, 2, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -493,7 +493,7 @@ new_r_Rot (ir_graph *irg, ir_node *block,
   ir_node *res;
   res = new_ir_node (irg, block, op_Rot, mode, 2, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -505,7 +505,7 @@ new_r_Abs (ir_graph *irg, ir_node *block,
   ir_node *res;
   res = new_ir_node (irg, block, op_Abs, mode, 1, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -517,7 +517,7 @@ new_r_Cmp (ir_graph *irg, ir_node *block,
   ir_node *res;
   res = new_ir_node (irg, block, op_Cmp, mode_T, 2, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -528,7 +528,7 @@ new_r_Jmp (ir_graph *irg, ir_node *block)
   ir_node *res;
   res = new_ir_node (irg, block, op_Jmp, mode_X, 0, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -539,7 +539,7 @@ new_r_Cond (ir_graph *irg, ir_node *block, ir_node *c)
   ir_node *res;
   res = new_ir_node (irg, block, op_Cond, mode_T, 1, in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -561,7 +561,7 @@ new_r_Call (ir_graph *irg, ir_node *block, ir_node *store,
 
   set_Call_type(res, type);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -579,7 +579,7 @@ new_r_Return (ir_graph *irg, ir_node *block,
   memcpy (&r_in[1], in, sizeof (ir_node *) * arity);
   res = new_ir_node (irg, block, op_Return, mode_X, r_arity, r_in);
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -591,7 +591,7 @@ new_r_Raise (ir_graph *irg, ir_node *block, ir_node *store, ir_node *obj)
   res = new_ir_node (irg, block, op_Raise, mode_X, 2, in);
 
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -604,7 +604,7 @@ new_r_Load (ir_graph *irg, ir_node *block,
   res = new_ir_node (irg, block, op_Load, mode_T, 2, in);
 
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -617,7 +617,7 @@ new_r_Store (ir_graph *irg, ir_node *block,
   res = new_ir_node (irg, block, op_Store, mode_T, 3, in);
 
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -633,7 +633,7 @@ new_r_Alloc (ir_graph *irg, ir_node *block, ir_node *store,
   res->attr.a.type = alloc_type;
 
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -648,7 +648,7 @@ new_r_Free (ir_graph *irg, ir_node *block, ir_node *store,
   res->attr.f = free_type;
 
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -671,7 +671,7 @@ new_r_Sel (ir_graph *irg, ir_node *block, ir_node *store, ir_node *objptr,
   res->attr.s.ent = ent;
 
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -693,7 +693,7 @@ new_r_SymConst (ir_graph *irg, ir_node *block, type_or_id *value,
     res->attr.i.tori.typ = (type *)value;
   }
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -705,7 +705,7 @@ new_r_Sync (ir_graph *irg, ir_node *block, int arity, ir_node **in)
   res = new_ir_node (irg, block, op_Sync, mode_M, arity, in);
 
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -728,7 +728,7 @@ new_Start (void)
 		     op_Start, mode_T, 0, NULL);
 
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -741,7 +741,7 @@ new_End (void)
 		     op_End, mode_X, -1, NULL);
 
   res = optimize (res);
-  ir_vrfy (res);
+  irn_vrfy (res);
   return res;
 }
 
@@ -757,7 +757,7 @@ new_Block (void)
 
   /* forget this optimization. use this only if mature !!!!
   res = optimize (res); */
-  ir_vrfy (res);
+  irn_vrfy (res);
 
   /** create a new dynamic array, which stores all parameters in irnodes */
   /** using the same obstack as the whole irgraph */
@@ -952,7 +952,7 @@ mature_block (ir_node *block)
     block->attr.block.matured = 1;
 
     block = optimize_in_place(block);
-    ir_vrfy(block);
+    irn_vrfy(block);
   }
 
 }
diff --git a/ir/ir/irgwalk.c b/ir/ir/irgwalk.c
index 24147d306..740758fc2 100644
--- a/ir/ir/irgwalk.c
+++ b/ir/ir/irgwalk.c
@@ -42,26 +42,20 @@ void irg_walk(ir_node *node,
 	      void (pre)(ir_node*, void*), void (post)(ir_node*, void*),
 	      void *env)
 {
-  unsigned long i;
-
   assert(node);
-  i = get_irg_visited(current_ir_graph);
-  ++i;
-  set_irg_visited(current_ir_graph, i);
+  inc_irg_visited (current_ir_graph);
   irg_walk_2(node, pre, post, env);
   return;
 }
 
 /***************************************************************************/
-void irg_block_walk_2(ir_node *node,
-		      void (pre)(ir_node*, void*), void (post)(ir_node*, void*),
-		      void *env)
+void irg_block_walk_2(ir_node *node, void (pre)(ir_node*, void*),
+		      void (post)(ir_node*, void*), void *env)
 {
   int i;
 
   assert(get_irn_opcode(node) == iro_Block);
 
-
   if(get_Block_block_visit(node) < get_irg_block_visited(current_ir_graph)) {
     set_Block_block_visit(node, get_irg_block_visited(current_ir_graph));
 
@@ -95,12 +89,8 @@ void irg_block_walk(ir_node *node,
 		    void (pre)(ir_node*, void*), void (post)(ir_node*, void*),
 		    void *env)
 {
-  unsigned long i;
-
   assert(node);
-  i = get_irg_block_visited(current_ir_graph);
-  ++i;
-  set_irg_block_visited(current_ir_graph, i);
+  inc_irg_block_visited(current_ir_graph);
   if (is_no_Block(node)) node = get_nodes_Block(node);
   assert(get_irn_opcode(node)  == iro_Block);
   irg_block_walk_2(node, pre, post, env);
diff --git a/ir/ir/iropt.c b/ir/ir/iropt.c
index 5b9aee281..6b2ea018d 100644
--- a/ir/ir/iropt.c
+++ b/ir/ir/iropt.c
@@ -937,7 +937,7 @@ optimize (ir_node *n)
   /* Remove nodes with dead (Bad) input. */
   n = gigo (n);
   /* Now we can verify the node, as it has no dead inputs any more. */
-  ir_vrfy(n);
+  irn_vrfy(n);
 
   /* Now we have a legal, useful node. Enter it in hash table for cse */
   if (get_opt_cse()) {
@@ -1012,7 +1012,7 @@ optimize_in_place (ir_node *n)
   /* Remove nodes with dead (Bad) input. */
   n = gigo (n);
   /* Now we can verify the node, as it has no dead inputs any more. */
-  ir_vrfy(n);
+  irn_vrfy(n);
 
   /* Now we have a legal, useful node. Enter it in hash table for cse */
   if (get_opt_cse()) {
diff --git a/ir/ir/irvrfy.c b/ir/ir/irvrfy.c
index e2d3074b0..9f0b4f744 100644
--- a/ir/ir/irvrfy.c
+++ b/ir/ir/irvrfy.c
@@ -10,7 +10,7 @@
 # include "irgwalk.h"
 
 void
-ir_vrfy (ir_node *n)
+irn_vrfy (ir_node *n)
 {
   int i;
   int opcode;
@@ -326,11 +326,11 @@ ir_vrfy (ir_node *n)
 
 void
 vrfy_wrap (ir_node *node, void *env) {
-  ir_vrfy(node);
+  irn_vrfy(node);
 }
 
 void
-vrfy_graph (ir_graph *irg)
+irg_vrfy (ir_graph *irg)
 {
   irg_walk(irg->end, vrfy_wrap, NULL, NULL);
 }
diff --git a/ir/ir/irvrfy.h b/ir/ir/irvrfy.h
index 45fe7eb9a..853bcc720 100644
--- a/ir/ir/irvrfy.h
+++ b/ir/ir/irvrfy.h
@@ -13,10 +13,10 @@
 # include "irgraph.h"
 
 /* Tests the types of predecessors of checknode. */
-void ir_vrfy (ir_node *checknode);
+void irn_vrfy (struct ir_node *checknode);
 
-/* Calls ir_vrfy for each node in irg. */
-void vrfy_graph (ir_graph *irg);
+/* Calls irn_vrfy for each node in irg. */
+void irg_vrfy (ir_graph *irg);
 
 
 # endif /* _IRVRFY_H_ */
diff --git a/testprograms/array-heap_example.c b/testprograms/array-heap_example.c
index 101a0603c..9750b788b 100644
--- a/testprograms/array-heap_example.c
+++ b/testprograms/array-heap_example.c
@@ -142,7 +142,7 @@ main(void)
   mature_block (main_irg->end_block);
 
   /* verify the graph */
-  vrfy_graph(main_irg);
+  irg_vrfy(main_irg);
 
   printf("\nDone building the graph.\n");
   printf("Dumping the graph and a type graph.\n");
diff --git a/testprograms/array-stack_example.c b/testprograms/array-stack_example.c
index 1cad06342..f6c81f9a1 100644
--- a/testprograms/array-stack_example.c
+++ b/testprograms/array-stack_example.c
@@ -128,7 +128,7 @@ main(void)
   mature_block (main_irg->end_block);
 
   /* verify the graph */
-  vrfy_graph(main_irg);
+  irg_vrfy(main_irg);
 
   printf("\nDone building the graph.\n");
   printf("Dumping the graph and a type graph.\n");
diff --git a/testprograms/call_str_example.c b/testprograms/call_str_example.c
index 593a2e894..20208ef52 100644
--- a/testprograms/call_str_example.c
+++ b/testprograms/call_str_example.c
@@ -93,7 +93,7 @@ int main(int argc, char **argv)
   mature_block (irg->end_block);
 
   /* verify the graph */
-  vrfy_graph(irg);
+  irg_vrfy(irg);
 
   printf("\nDone building the graph.  Dumping it.\n");
   dump_ir_block_graph (irg);
diff --git a/testprograms/cond_example.c b/testprograms/cond_example.c
index 2c630b7c5..cb6c44c90 100644
--- a/testprograms/cond_example.c
+++ b/testprograms/cond_example.c
@@ -114,7 +114,7 @@ int main(int argc, char **argv)
   mature_block (irg->end_block);
 
   /* verify the graph */
-  vrfy_graph(irg);
+  irg_vrfy(irg);
 
   printf("\nDone building the graph.  Dumping it.\n");
   dump_ir_block_graph (irg);
diff --git a/testprograms/const_eval_example.c b/testprograms/const_eval_example.c
index b3ba444f0..3a10de81f 100644
--- a/testprograms/const_eval_example.c
+++ b/testprograms/const_eval_example.c
@@ -77,7 +77,7 @@ main(void)
   mature_block (irg->end_block);
 
   /* verify the graph */
-  vrfy_graph(irg);
+  irg_vrfy(irg);
 
   printf("\nDone building the graph.  Dumping it.\n");
   dump_ir_block_graph (irg);
diff --git a/testprograms/dead_block_example.c b/testprograms/dead_block_example.c
index a5ad8b6e0..e6a5786ce 100644
--- a/testprograms/dead_block_example.c
+++ b/testprograms/dead_block_example.c
@@ -123,7 +123,7 @@ int main(int argc, char **argv)
   mature_block (irg->end_block);
 
   /* verify the graph */
-  vrfy_graph(irg);
+  irg_vrfy(irg);
 
   printf("\nDone building the graph.\n");
   local_optimize_graph (irg);
diff --git a/testprograms/empty.c b/testprograms/empty.c
index b414aa9c5..8198b644c 100644
--- a/testprograms/empty.c
+++ b/testprograms/empty.c
@@ -83,7 +83,7 @@ int main(int argc, char **argv)
   mature_block (irg->end_block);
 
   /* verify the graph */
-  vrfy_graph(irg);
+  irg_vrfy(irg);
 
   printf("\nDone building the graph.  Dumping it.\n");
   dump_ir_block_graph (irg);
diff --git a/testprograms/global_var_example.c b/testprograms/global_var_example.c
index c1ababb44..956192f93 100644
--- a/testprograms/global_var_example.c
+++ b/testprograms/global_var_example.c
@@ -106,7 +106,7 @@ int main(int argc, char **argv)
   mature_block (irg->end_block);
 
   /* verify the graph */
-  vrfy_graph(irg);
+  irg_vrfy(irg);
 
   printf("\nDone building the graph.  Dumping it.\n");
   dump_ir_block_graph (irg);
diff --git a/testprograms/if_else_example.c b/testprograms/if_else_example.c
index 837843c46..129b076e1 100644
--- a/testprograms/if_else_example.c
+++ b/testprograms/if_else_example.c
@@ -120,7 +120,7 @@ int main(int argc, char **argv)
   mature_block (irg->end_block);
 
   /* verify the graph */
-  vrfy_graph(irg);
+  irg_vrfy(irg);
 
   printf("\nDone building the graph.  Dumping it.\n");
   dump_ir_block_graph (irg);
diff --git a/testprograms/if_example.c b/testprograms/if_example.c
index e20ad23fb..38b799ac3 100644
--- a/testprograms/if_example.c
+++ b/testprograms/if_example.c
@@ -104,7 +104,7 @@ main(void)
   mature_block (irg->end_block);
 
   /* verify the graph */
-  vrfy_graph(irg);
+  irg_vrfy(irg);
 
   /* output the vcg file */
   printf("\nDone building the graph.  Dumping it.\n");
diff --git a/testprograms/if_while_example.c b/testprograms/if_while_example.c
index 1d418f940..a25be7644 100644
--- a/testprograms/if_while_example.c
+++ b/testprograms/if_while_example.c
@@ -112,7 +112,7 @@ main(void)
   mature_block (irg->end_block);
 
   /* verify the graph */
-  vrfy_graph(irg);
+  irg_vrfy(irg);
 
   /* output the vcg file */
   printf("\nDone building the graph.  Dumping it.\n");
diff --git a/testprograms/irr_cf_example.c b/testprograms/irr_cf_example.c
index 9056fc103..345e4a327 100644
--- a/testprograms/irr_cf_example.c
+++ b/testprograms/irr_cf_example.c
@@ -124,7 +124,7 @@ int main(int argc, char **argv)
   mature_block (irg->end_block);
 
   /* verify the graph */
-  vrfy_graph(irg);
+  irg_vrfy(irg);
 
   printf("\nDone building the graph.\n");
   printf("Dumping the graph and a control flow graph.\n");
diff --git a/testprograms/irr_loop_example.c b/testprograms/irr_loop_example.c
index 51f63be17..e9c900298 100644
--- a/testprograms/irr_loop_example.c
+++ b/testprograms/irr_loop_example.c
@@ -112,7 +112,7 @@ int main(int argc, char **argv)
   mature_block (irg->end_block);
 
   /* verify the graph */
-  vrfy_graph(irg);
+  irg_vrfy(irg);
 
   printf("\nDone building the graph..\n");
   printf("Dumping the graph and a control flow graph.\n");
diff --git a/testprograms/memory_example.c b/testprograms/memory_example.c
index 8434f26ee..953f4747a 100644
--- a/testprograms/memory_example.c
+++ b/testprograms/memory_example.c
@@ -132,7 +132,7 @@ main(void)
   mature_block (irg->end_block);
 
   /* verify the graph */
-  vrfy_graph(irg);
+  irg_vrfy(irg);
 
   printf("\nDone building the graph.  Dumping it.\n");
   dump_ir_block_graph (irg);
diff --git a/testprograms/oo_program_example.c b/testprograms/oo_program_example.c
index aba93088f..def051e50 100644
--- a/testprograms/oo_program_example.c
+++ b/testprograms/oo_program_example.c
@@ -203,7 +203,7 @@ main(void)
   mature_block (c_irg->end_block);
 
   /* verify the graph */
-  vrfy_graph(main_irg);
+  irg_vrfy(main_irg);
 
   printf("\nDone building the graph.\n");
   printf("Dumping the graph and a type graph.\n");
-- 
2.20.1