From: Alex Coplan <alex.coplan@arm.com>
Date: Fri, 20 Oct 2023 10:46:27 +0000 (+0100)
Subject: rtl-ssa: Don't leave NOTE_INSN_DELETED around
X-Git-Tag: basepoints/gcc-15~5355
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e90c7bd520545b31fee687aab58cb4b258d1db16;p=thirdparty%2Fgcc.git

rtl-ssa: Don't leave NOTE_INSN_DELETED around

This patch tweaks change_insns to also call ::remove_insn to ensure the
underlying RTL insn gets removed from the insn chain in the case of a
deletion.

This avoids leaving NOTE_INSN_DELETED around after deleting insns.

For movement, the RTL insn chain is updated earlier in change_insns with
the call to move_insn.  For deletion, it seems reasonable to do it here.

gcc/ChangeLog:

	* rtl-ssa/changes.cc (function_info::change_insns): Ensure we call
	::remove_insn on deleted insns.
---

diff --git a/gcc/rtl-ssa/changes.cc b/gcc/rtl-ssa/changes.cc
index 523ad60d7d89..73ab3ccfd242 100644
--- a/gcc/rtl-ssa/changes.cc
+++ b/gcc/rtl-ssa/changes.cc
@@ -706,7 +706,11 @@ function_info::change_insns (array_slice<insn_change *> changes)
       insn_change &change = *changes[i];
       insn_info *insn = change.insn ();
       if (change.is_deletion ())
-	remove_insn (insn);
+	{
+	  if (rtx_insn *rtl = insn->rtl ())
+	    ::remove_insn (rtl); // Remove the underlying RTL insn.
+	  remove_insn (insn);
+	}
       else if (insn_info *placeholder = placeholders[i])
 	{
 	  // Check if earlier movements turned a move into a no-op.