diff mbox series

backthreader dump fix

Message ID 20220805123156.8F62313A9C@imap2.suse-dmz.suse.de
State Committed
Commit 6ca948264d67d4079b5868342257aee79259e301
Headers
Series backthreader dump fix |

Commit Message

Richard Biener Aug. 5, 2022, 12:31 p.m. UTC 
  This fixes odd SUCCEEDED dumps from the backthreader registry that
can happen even though register_jump_thread cancelled the thread
as invalid.

Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed.

	* tree-ssa-threadbackward.cc (back_threader::maybe_register_path):
	Check whether the registry register_path rejected the path.
	(back_threader_registry::register_path): Return whether
	register_jump_thread succeeded.
---
 gcc/tree-ssa-threadbackward.cc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Comments

Jeff Law Aug. 5, 2022, 3:27 p.m. UTC | #1 
On 8/5/2022 6:31 AM, Richard Biener via Gcc-patches wrote:
> This fixes odd SUCCEEDED dumps from the backthreader registry that
> can happen even though register_jump_thread cancelled the thread
> as invalid.
>
> Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed.
>
> 	* tree-ssa-threadbackward.cc (back_threader::maybe_register_path):
> 	Check whether the registry register_path rejected the path.
> 	(back_threader_registry::register_path): Return whether
> 	register_jump_thread succeeded.
LGTM.
jeff
diff mbox series

Patch

diff --git a/gcc/tree-ssa-threadbackward.cc b/gcc/tree-ssa-threadbackward.cc
index 3acd66a7780..332a1d2a1dd 100644
--- a/gcc/tree-ssa-threadbackward.cc
+++ b/gcc/tree-ssa-threadbackward.cc
@@ -243,10 +243,9 @@  back_threader::maybe_register_path ()
 	  bool irreducible = false;
 	  if (m_profit.profitable_path_p (m_path, m_name, taken_edge,
 					  &irreducible)
-	      && debug_counter ())
+	      && debug_counter ()
+	      && m_registry.register_path (m_path, taken_edge))
 	    {
-	      m_registry.register_path (m_path, taken_edge);
-
 	      if (irreducible)
 		vect_free_loop_info_assumptions (m_path[0]->loop_father);
 	    }
@@ -858,8 +857,7 @@  back_threader_registry::register_path (const vec<basic_block> &m_path,
     }
 
   push_edge (jump_thread_path, taken_edge, EDGE_NO_COPY_SRC_BLOCK);
-  register_jump_thread (jump_thread_path);
-  return true;
+  return register_jump_thread (jump_thread_path);
 }
 
 // Thread all suitable paths in the current function.