From: Bernd Schmidt <bernds@redhat.co.uk>
Date: Fri, 22 Dec 2000 14:36:32 +0000 (+0000)
Subject: Fix a regression introduced by last change
X-Git-Tag: prereleases/gcc-2.95.3-test1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9632baabf3389fa2d7f95680e88da710dee4dbd;p=thirdparty%2Fgcc.git

Fix a regression introduced by last change

From-SVN: r38459
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c5d71cfa9bfe..f54aa89f70e3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2000-12-22  Bernd Schmidt  <bernds@redhat.co.uk>
 
+	* flow.c (propagate_block): Use flow_delete_insn instead of
+	NOTEifying a dead ADDR_VEC.
+
 	Fri Sep 10 11:43:07 1999  Philip Blundell <pb@futuretv.com>
 	* configure.in, config/arm/linux-oldld.h,
 	config/arm/linux-elf26.h, config/arm/linux-elf.h: Backport latest
diff --git a/gcc/flow.c b/gcc/flow.c
index 75b6ef485759..b9c9d07c5b97 100644
--- a/gcc/flow.c
+++ b/gcc/flow.c
@@ -2763,17 +2763,8 @@ propagate_block (old, first, last, final, significant, bnum, remove_dead_code)
 			  int i;
 			  for (i = 0; i < len; i++)
 			    LABEL_NUSES (XEXP (XVECEXP (pat, diff_vec_p, i), 0))--;
-			  PUT_CODE (next, NOTE);
-			  NOTE_LINE_NUMBER (next) = NOTE_INSN_DELETED;
-			  NOTE_SOURCE_FILE (next) = 0;
-
-			  if ((next = next_nonnote_insn (label)) != NULL
-			      && GET_CODE (next) == BARRIER)
-			    {
-			      PUT_CODE (next, NOTE);
-			      NOTE_LINE_NUMBER (next) = NOTE_INSN_DELETED;
-			      NOTE_SOURCE_FILE (next) = 0;
-			    }
+
+			  flow_delete_insn (next);
 			}
 		    }
 		}