From: Richard Biener <rguenther@suse.de>
Date: Mon, 5 May 2014 09:28:39 +0000 (+0000)
Subject: passes.c (execute_function_todo): Move TODO_verify_flow under the TODO_verify_ul... 
X-Git-Tag: releases/gcc-5.1.0~7779
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e7f8713ea1d2be35a20892f4fbd4c87149aa0ac;p=thirdparty%2Fgcc.git

passes.c (execute_function_todo): Move TODO_verify_flow under the TODO_verify_ul umbrella.

2014-05-05  Richard Biener  <rguenther@suse.de>

	* passes.c (execute_function_todo): Move TODO_verify_flow under
	the TODO_verify_ul umbrella.

From-SVN: r210068
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 18959f6eacb5..87d71416a785 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-05  Richard Biener  <rguenther@suse.de>
+
+	* passes.c (execute_function_todo): Move TODO_verify_flow under
+	the TODO_verify_ul umbrella.
+
 2014-05-05  Richard Biener  <rguenther@suse.de>
 
 	PR middle-end/61010
diff --git a/gcc/passes.c b/gcc/passes.c
index dbff5875a5d9..30c849fce390 100644
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -1783,11 +1783,11 @@ execute_function_todo (function *fn, void *data)
 	    /* IPA passes leave stmts to be fixed up, so make sure to
 	       not verify SSA operands whose verifier will choke on that.  */
 	    verify_ssa (true, !from_ipa_pass);
-	}
-      if (flags & TODO_verify_flow)
-	verify_flow_info ();
-      if (flags & TODO_verify_il)
-	{
+	  /* IPA passes leave basic-blocks unsplit, so make sure to
+	     not trip on that.  */
+	  if ((cfun->curr_properties & PROP_cfg)
+	      && !from_ipa_pass)
+	    verify_flow_info ();
 	  if (current_loops
 	      && loops_state_satisfies_p (LOOP_CLOSED_SSA))
 	    verify_loop_closed_ssa (false);