* unroll.c (verify_addresses): Use validate_replace_rtx to undo the

changes.  Abort if the undo fails.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@20404 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 8 insertions, 2 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 24fa34aafaf..de58977765e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 10 09:47:13 1998  Richard Earnshaw (rearnsha@arm.com)
+
+	* unroll.c (verify_addresses): Use validate_replace_rtx to undo the 
+	changes.  Abort if the undo fails.
+
 Wed Jun 10 08:56:27 1998  John Carr  <jfc@mit.edu>
 
 	* reload1.c (reload_cse_simplify_operands): Do not call gen_rtx_REG
diff --git a/gcc/unroll.c b/gcc/unroll.c
index 2f6a2e80c37..46dc7ac4499 100644
--- a/gcc/unroll.c
+++ b/gcc/unroll.c
@@ -2664,9 +2664,10 @@ verify_addresses (v, giv_inc, unroll_number)
       || ! validate_replace_rtx (*v->location, last_addr, v->insn))
     ret = 0;
 
-  /* Now put things back the way they were before.  This will always
+  /* Now put things back the way they were before.  This should always
    succeed.  */
-  validate_change (v->insn, v->location, orig_addr, 0);
+  if (! validate_replace_rtx (*v->location, orig_addr, v->insn))
+    abort ();
 
   return ret;
 }