From: Richard Biener <rguenther@suse.de>
Date: Mon, 16 Nov 2015 14:06:08 +0000 (+0000)
Subject: re PR middle-end/68117 (error: invalid PHI argument <<< Unknown tree: <invalid tree... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0d334e376569c1585061f81e0b4ce80b1dfadd41;p=gcc.git

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

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 d106f52a88f..2bba1191da2 100644
--- 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 ae893527a0f..e55467a6bfe 100644
--- 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 ();