no need for pointless comments

[libfirm] / ir / ir / irvrfy.c

diff --git a/ir/ir/irvrfy.c b/ir/ir/irvrfy.c
index 3fd3800..b9b28b0 100644 (file)
--- a/ir/ir/irvrfy.c
+++ b/ir/ir/irvrfy.c
@@ -28,7 +28,6 @@
 #include "irprog.h"
 #include "irop_t.h"
 #include "irgraph_t.h"
-#include "ircgcons.h"
 #include "irvrfy_t.h"
 #include "irgwalk.h"
 #include "irdump.h"
@@ -727,6 +726,8 @@ static int verify_node_Proj_Proj(ir_node *pred, ir_node *p)
                                (proj >= 0 && mode_is_datab(mode)),
                                "wrong Proj from Proj from Call", 0);
                        mt = get_Call_type(pred);
+                       ASSERT_AND_RET(mt == get_unknown_type() || is_Method_type(mt),
+                                       "wrong call type on call", 0);
                        ASSERT_AND_RET(
                                (proj < get_method_n_ress(mt)),
                                "More Projs for results than results in type.", 0);
@@ -765,46 +766,6 @@ static int verify_node_Proj_Tuple(ir_node *n, ir_node *p)
        return 1;
 }
 
-/**
- * verify a Proj(CallBegin) node
- */
-static int verify_node_Proj_CallBegin(ir_node *n, ir_node *p)
-{
-       (void) n;
-       (void) p;
-       return 1;
-}
-
-/**
- * verify a Proj(EndReg) node
- */
-static int verify_node_Proj_EndReg(ir_node *n, ir_node *p)
-{
-       (void) n;
-       (void) p;
-#ifdef INTERPROCEDURAL_VIEW
-       ASSERT_AND_RET(
-               (get_irp_ip_view_state() != ip_view_no),
-               "EndReg may only appear if ip view is constructed.", 0);
-#endif
-       return 1;
-}
-
-/**
- * verify a Proj(EndExcept) node
- */
-static int verify_node_Proj_EndExcept(ir_node *n, ir_node *p)
-{
-       (void) n;
-       (void) p;
-#ifdef INTERPROCEDURAL_VIEW
-       ASSERT_AND_RET(
-               (get_irp_ip_view_state() != ip_view_no),
-               "EndExcept may only appear if ip view is constructed.", 0);
-#endif
-       return 1;
-}
-
 /**
  * verify a Proj(CopyB) node
  */
@@ -986,25 +947,6 @@ static int verify_node_IJmp(ir_node *n, ir_graph *irg)
        return 1;
 }
 
-/**
- * verify a Break node
- */
-static int verify_node_Break(ir_node *n, ir_graph *irg)
-{
-       ir_mode *mymode = get_irn_mode(n);
-       (void) irg;
-
-#ifdef INTERPROCEDURAL_VIEW
-       ASSERT_AND_RET((get_irp_ip_view_state() != ip_view_no),
-               "Break may only appear if ip view is constructed.", 0);
-#endif
-       ASSERT_AND_RET(
-               /* Jmp: BB --> X */
-               mymode == mode_X, "Break node", 0
-       );
-       return 1;
-}
-
 /**
  * verify a Cond node
  */
@@ -1698,21 +1640,6 @@ static int verify_node_Phi(ir_node *n, ir_graph *irg)
        return 1;
 }
 
-/**
- * verify a Filter node
- */
-static int verify_node_Filter(ir_node *n, ir_graph *irg)
-{
-       (void) n;
-       (void) irg;
-#ifdef INTERPROCEDURAL_VIEW
-       ASSERT_AND_RET((get_irp_ip_view_state() != ip_view_no),
-               "Filter may only appear if ip view is constructed.", 0);
-#endif
-       /* We should further do tests as for Proj and Phi. */
-       return 1;
-}
-
 /**
  * verify a Load node
  */
@@ -1901,7 +1828,7 @@ static int verify_node_CopyB(ir_node *n, ir_graph *irg)
        }
 
        ASSERT_AND_RET(
-               is_compound_type(t),
+               is_compound_type(t) || is_Array_type(t),
                "CopyB node should copy compound types only", 0 );
 
        /* NoMem nodes are only allowed as memory input if the CopyB is NOT pinned.
@@ -2212,7 +2139,7 @@ static void check_bads(ir_node *node, void *env)
                                                fprintf(stderr, "irg_vrfy_bads: Block %ld has Bad predecessor\n", get_irn_node_nr(node));
                                        }
                                        if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
-                                               dump_ir_block_graph_sched(current_ir_graph, "-assert");
+                                               dump_ir_graph(current_ir_graph, "-assert");
                                                assert(0 && "Bad CF detected");
                                        }
                                }
@@ -2229,7 +2156,7 @@ static void check_bads(ir_node *node, void *env)
                                        fprintf(stderr, "irg_vrfy_bads: node %ld has Bad Block\n", get_irn_node_nr(node));
                                }
                                if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
-                                       dump_ir_block_graph_sched(current_ir_graph, "-assert");
+                                       dump_ir_graph(current_ir_graph, "-assert");
                                        assert(0 && "Bad CF detected");
                                }
                        }
@@ -2243,7 +2170,7 @@ static void check_bads(ir_node *node, void *env)
                                        fprintf(stderr, "irg_vrfy_bads: node %ld is a Tuple\n", get_irn_node_nr(node));
                                }
                                if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
-                                       dump_ir_block_graph_sched(current_ir_graph, "-assert");
+                                       dump_ir_graph(current_ir_graph, "-assert");
                                        assert(0 && "Tuple detected");
                                }
                        }
@@ -2264,7 +2191,7 @@ static void check_bads(ir_node *node, void *env)
                                                        fprintf(stderr, "irg_vrfy_bads: Phi %ld has Bad Input\n", get_irn_node_nr(node));
                                                }
                                                if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
-                                                       dump_ir_block_graph_sched(current_ir_graph, "-assert");
+                                                       dump_ir_graph(current_ir_graph, "-assert");
                                                        assert(0 && "Bad CF detected");
                                                }
                                        }
@@ -2278,7 +2205,7 @@ static void check_bads(ir_node *node, void *env)
                                                fprintf(stderr, "irg_vrfy_bads: node %ld has Bad Input\n", get_irn_node_nr(node));
                                        }
                                        if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
-                                               dump_ir_block_graph_sched(current_ir_graph, "-assert");
+                                               dump_ir_graph(current_ir_graph, "-assert");
                                                assert(0 && "Bad NON-CF detected");
                                        }
                                }
@@ -2318,7 +2245,6 @@ void firm_set_default_verifyer(ir_opcode code, ir_op_ops *ops)
        CASE(Start);
        CASE(Jmp);
        CASE(IJmp);
-       CASE(Break);
        CASE(Cond);
        CASE(Return);
        CASE(Raise);
@@ -2349,7 +2275,6 @@ void firm_set_default_verifyer(ir_opcode code, ir_op_ops *ops)
        CASE(Conv);
        CASE(Cast);
        CASE(Phi);
-       CASE(Filter);
        CASE(Load);
        CASE(Store);
        CASE(Alloc);
@@ -2385,9 +2310,6 @@ void firm_set_default_verifyer(ir_opcode code, ir_op_ops *ops)
        CASE(Alloc);
        CASE(Proj);
        CASE(Tuple);
-       CASE(CallBegin);
-       CASE(EndReg);
-       CASE(EndExcept);
        CASE(CopyB);
        CASE(Bound);
        default: