re PR middle-end/68117 (error: invalid PHI argument <<< Unknown tree: <invalid tree...

2015-11-16  Richard Biener  <rguenther@suse.de>

	PR middle-end/68117
	* cfgexpand.c (pass_expand::execute): Destroy the edge
	redirection var map before setting RTL CFG hooks.

From-SVN: r230424

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d106f52a88f6cd8df0ec74a028209cf208b6b597..2bba1191da2af5c722ec185c6b866def3865a12d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-11-16  Richard Biener  <rguenther@suse.de>
+
+       PR middle-end/68117
+       * cfgexpand.c (pass_expand::execute): Destroy the edge
+       redirection var map before setting RTL CFG hooks.
+
 2015-11-16  Alan Lawrence  <alan.lawrence@arm.com>
 
        * config/i386/sse.md (reduc_splus_v8df): Rename to...

diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index ae893527a0f94b92c49321c78e3d99228434e319..e55467a6bfecab5e1925c522d4da906e215b81bb 100644 (file)
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -6275,6 +6275,9 @@ pass_expand::execute (function *fun)
 
   expand_phi_nodes (&SA);
 
+  /* Release any stale SSA redirection data.  */
+  redirect_edge_var_map_destroy ();
+
   /* Register rtl specific functions for cfg.  */
   rtl_register_cfg_hooks ();