X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Flocall.lisp;h=1c6db26ec5390103b5c7821db9902f8dbb5d16ab;hb=c0578d9893429c9c0da80ea5920360e4621fddab;hp=dffb4d0557a32c921c33585b8d2fe296c2d1f6bd;hpb=a160917364f85b38dc0826a5e3dcef87e3c4c62c;p=sbcl.git diff --git a/src/compiler/locall.lisp b/src/compiler/locall.lisp index dffb4d0..1c6db26 100644 --- a/src/compiler/locall.lisp +++ b/src/compiler/locall.lisp @@ -65,7 +65,7 @@ (let* ((other (trivial-lambda-var-ref-lvar use))) (unless (eq other lvar) (handle-nested-dynamic-extent-lvars dx other))))))) - (cons lvar + (cons (cons dx lvar) (if (listp uses) (loop for use in uses when (use-good-for-dx-p use dx) @@ -95,8 +95,8 @@ (make-lexenv :default (node-lexenv call) :cleanup cleanup)) (push entry (lambda-entries (node-home-lambda entry))) - (dolist (lvar dx-lvars) - (setf (lvar-dynamic-extent lvar) cleanup))))) + (dolist (cell dx-lvars) + (setf (lvar-dynamic-extent (cdr cell)) cleanup))))) (values)) ;;; This function handles merging the tail sets if CALL is potentially @@ -217,8 +217,7 @@ ;; KLUDGE: (NOT (< ...)) instead of >= avoids one round of ;; deftransforms and lambda-conversion. `((,(if (zerop min) t `(not (< ,n-supplied ,max))) - ,(let ((n-context (gensym)) - (n-count (gensym))) + ,(with-unique-names (n-context n-count) `(multiple-value-bind (,n-context ,n-count) (%more-arg-context ,n-supplied ,max) (locally