1.0.9.52: copy propagation interfering with local calls

[sbcl.git] / src / compiler / copyprop.lisp

diff --git a/src/compiler/copyprop.lisp b/src/compiler/copyprop.lisp
index 5a4e941..10a1768 100644 (file)
--- a/src/compiler/copyprop.lisp
+++ b/src/compiler/copyprop.lisp
@@ -162,11 +162,11 @@
          (unless (sset-member original in)
            (return nil)))
        (let ((info (vop-info vop)))
-         (not (and (eq (vop-info-move-args info) :local-call)
-                   (>= (or (position-in #'tn-ref-across arg (vop-args vop)
-                                        :key #'tn-ref-tn)
-                           (error "Couldn't find REF?"))
-                       (length (template-arg-types info))))))))
+         (not (or (eq (vop-info-move-args info) :local-call)
+                  (>= (or (position-in #'tn-ref-across arg (vop-args vop)
+                                       :key #'tn-ref-tn)
+                          (error "Couldn't find REF?"))
+                      (length (template-arg-types info))))))))
 
 ;;; Make use of the result of flow analysis to eliminate copies. We
 ;;; scan the VOPs in block, propagating copies and keeping our IN set