From 132aa0ed94653f99567228f628667fefcb21884c Mon Sep 17 00:00:00 2001
From: ram <ram>
Date: Fri, 14 Sep 1990 16:51:51 +0000
Subject: [PATCH] Fixed a bug in MERGE-ALIAS-CONFLICTS where conflicts could
 fail to be properly inserted into the original TNs conflicts list.

---
 compiler/life.lisp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/life.lisp b/compiler/life.lisp
index 761be8c61..21ff5d37c 100644
--- a/compiler/life.lisp
+++ b/compiler/life.lisp
@@ -947,7 +947,7 @@
 		       (setf (global-conflicts-tn-next oprev) conf)
 		       (setf (tn-global-conflicts original) conf))
 		   (change-global-conflicts-tn conf original)
-		   (shiftf conf (global-conflicts-tn-next conf) oconf))
+		   (shiftf oprev conf (global-conflicts-tn-next conf) oconf))
 		  (t
 		   (merge-alias-block-conflicts conf oconf)
 		   (shiftf oprev oconf (global-conflicts-tn-next oconf))
-- 
GitLab