Patchwork Fix mv?.C ICEs

login
register
mail settings
Submitter Richard Guenther
Date June 18, 2013, 2:12 p.m.
Message ID <alpine.LNX.2.00.1306181611421.22313@zhemvz.fhfr.qr>
Download mbox | patch
Permalink /patch/252352/
State New
Headers show

Comments

Richard Guenther - June 18, 2013, 2:12 p.m.
This fixes the mv?.C ICEs in the testsuite (and transforms a subset
of them to execute fails for me).

Running target unix/
FAIL: g++.dg/ext/mv12.C -std=gnu++98 execution test
FAIL: g++.dg/ext/mv12.C -std=gnu++11 execution test
FAIL: g++.dg/ext/mv2.C -std=gnu++98 execution test
FAIL: g++.dg/ext/mv2.C -std=gnu++11 execution test
FAIL: g++.dg/ext/mv5.C -std=gnu++98 execution test
FAIL: g++.dg/ext/mv5.C -std=gnu++11 execution test

Bootstrapped and tested on x86_64-unknown-linux-gnu, applied to trunk.

Richard.

2013-06-18  Richard Biener  <rguenther@suse.de>

	* Makefile.in (cgraphunit.o): Add $(CFGLOOP_H) dependency.
	* cgraphunit.c: Include cfgloop.h.
	(init_lowered_empty_function): Initialize the loop tree.
	(assemble_thunk): Insert new BBs into loops.

Patch

Index: gcc/Makefile.in
===================================================================
--- gcc/Makefile.in	(revision 200164)
+++ gcc/Makefile.in	(working copy)
@@ -2903,7 +2903,7 @@  cgraphunit.o : cgraphunit.c $(CONFIG_H)
    $(TREE_FLOW_H) $(TREE_PASS_H) debug.h $(DIAGNOSTIC_H) \
    $(FIBHEAP_H) output.h $(PARAMS_H) $(RTL_H) $(IPA_PROP_H) \
    gt-cgraphunit.h tree-iterator.h $(COVERAGE_H) $(TREE_DUMP_H) \
-   $(GIMPLE_PRETTY_PRINT_H) $(IPA_INLINE_H) $(IPA_UTILS_H) \
+   $(GIMPLE_PRETTY_PRINT_H) $(IPA_INLINE_H) $(IPA_UTILS_H) $(CFGLOOP_H) \
    $(LTO_STREAMER_H) output.h $(REGSET_H) $(EXCEPT_H) $(GCC_PLUGIN_H) plugin.h
 cgraphclones.o : cgraphclones.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
    $(TREE_H) langhooks.h $(TREE_INLINE_H) toplev.h $(DIAGNOSTIC_CORE_H) $(FLAGS_H) $(GGC_H) \
Index: gcc/cgraphunit.c
===================================================================
--- gcc/cgraphunit.c	(revision 200164)
+++ gcc/cgraphunit.c	(working copy)
@@ -192,6 +192,7 @@  along with GCC; see the file COPYING3.
 #include "ipa-utils.h"
 #include "lto-streamer.h"
 #include "except.h"
+#include "cfgloop.h"
 #include "regset.h"     /* FIXME: For reg_obstack.  */
 
 /* Queue of cgraph nodes scheduled to be added into cgraph.  This is a
@@ -1196,18 +1197,24 @@  init_lowered_empty_function (tree decl,
       init_tree_ssa (cfun);
       init_ssa_operands (cfun);
       cfun->gimple_df->in_ssa_p = true;
+      cfun->curr_properties |= PROP_ssa;
     }
 
   DECL_INITIAL (decl) = make_node (BLOCK);
 
   DECL_SAVED_TREE (decl) = error_mark_node;
-  cfun->curr_properties |=
-    (PROP_gimple_lcf | PROP_gimple_leh | PROP_cfg | PROP_ssa | PROP_gimple_any);
+  cfun->curr_properties |= (PROP_gimple_lcf | PROP_gimple_leh | PROP_gimple_any
+			    | PROP_cfg | PROP_loops);
+
+  set_loops_for_fn (cfun, ggc_alloc_cleared_loops ());
+  init_loops_structure (cfun, loops_for_fn (cfun), 1);
+  loops_for_fn (cfun)->state |= LOOPS_MAY_HAVE_MULTIPLE_LATCHES;
 
   /* Create BB for body of the function and connect it properly.  */
   bb = create_basic_block (NULL, (void *) 0, ENTRY_BLOCK_PTR);
-  make_edge (ENTRY_BLOCK_PTR, bb, 0);
+  make_edge (ENTRY_BLOCK_PTR, bb, EDGE_FALLTHRU);
   make_edge (bb, EXIT_BLOCK_PTR, 0);
+  add_bb_to_loop (bb, ENTRY_BLOCK_PTR->loop_father);
 
   return bb;
 }
@@ -1452,6 +1459,9 @@  assemble_thunk (struct cgraph_node *node
 	      then_bb = create_basic_block (NULL, (void *) 0, bb);
 	      return_bb = create_basic_block (NULL, (void *) 0, then_bb);
 	      else_bb = create_basic_block (NULL, (void *) 0, else_bb);
+	      add_bb_to_loop (then_bb, bb->loop_father);
+	      add_bb_to_loop (return_bb, bb->loop_father);
+	      add_bb_to_loop (else_bb, bb->loop_father);
 	      remove_edge (single_succ_edge (bb));
 	      true_label = gimple_block_label (then_bb);
 	      stmt = gimple_build_cond (NE_EXPR, restmp,