Index: /trunk/source/compiler/X86/x862.lisp
===================================================================
--- /trunk/source/compiler/X86/x862.lisp	(revision 15049)
+++ /trunk/source/compiler/X86/x862.lisp	(revision 15050)
@@ -94,4 +94,7 @@
 		    `(progn
 		       (x862-invalidate-regmap)
+		       (backend-gen-label ,',segvar ,,labelnum-var)))
+                  (@+ (,labelnum-var)
+                    `(progn             ;keep regmap
 		       (backend-gen-label ,',segvar ,,labelnum-var)))
                   (@= (,labelnum-var)
@@ -188,4 +191,5 @@
 (defvar *x862-tail-vsp* nil)
 (defvar *x862-tail-nargs* nil)
+(defvar *x862-tail-arg-vars* nil)
 (defvar *x862-tail-allow* t)
 (defvar *x862-reckless* nil)
@@ -611,4 +615,5 @@
            (*x862-tail-vsp* nil)
            (*x862-tail-nargs* nil)
+           (*x862-tail-arg-vars* nil)
            (*x862-inhibit-register-allocation* nil)
            (*x862-tail-allow* t)
@@ -2899,5 +2904,5 @@
       (! call-known-symbol *x862-arg-z*))))
 
-(defun x862-self-call (seg nargs tail-p)
+(defun x862-do-self-call (seg nargs tail-p)
   (with-x86-local-vinsn-macros (seg)
     (cond ((and tail-p
@@ -2942,10 +2947,8 @@
            (callable (or symp lfunp label-p))
            (destreg (if symp ($ *x862-fname*) (unless label-p ($ *x862-temp0*))))
-           (alternate-tail-call
-            (and tail-p label-p *x862-tail-label* (eql nargs *x862-tail-nargs*) (not spread-p)))
+
            (set-nargs-vinsn nil))
       (or (and label-p nargs (not spread-p) (not (x862-mvpass-p xfer))
-               (not alternate-tail-call)
-               (x862-self-call seg nargs tail-p))
+               (x862-do-self-call seg nargs tail-p))
           (progn
             (when expression-p
@@ -2965,6 +2968,5 @@
                 (x862-copy-register seg destreg a-reg))
               (unless spread-p
-                (unless alternate-tail-call
-                  (x862-restore-nvrs seg *x862-register-restore-ea* *x862-register-restore-count* (and nargs (<= nargs *x862-target-num-arg-regs*))))))
+                (x862-restore-nvrs seg *x862-register-restore-ea* *x862-register-restore-count* (and nargs (<= nargs *x862-target-num-arg-regs*)))))
             (if spread-p
               (progn
@@ -2984,6 +2986,5 @@
                   (x862-restore-nvrs seg *x862-register-restore-ea* *x862-register-restore-count* nil)))
               (if nargs
-                (unless alternate-tail-call
-                  (setq set-nargs-vinsn (x862-set-nargs seg nargs)))
+                (setq set-nargs-vinsn (x862-set-nargs seg nargs))
                 (! pop-argument-registers)))
             (if callable
@@ -3014,9 +3015,5 @@
                           (x862-call-symbol seg nil)
                           (! call-known-function))))))
-                (if alternate-tail-call
-                  (progn
-                    (x862-unwind-stack seg xfer 0 0 *x862-tail-vsp*)
-                    (! jump (aref *backend-labels* *x862-tail-label*)))
-                  (progn
+                (progn
                     (x862-unwind-stack seg xfer 0 0 #x7fffff)
                     (if (and (not spread-p) nargs (%i<= nargs *x862-target-num-arg-regs*))
@@ -3080,5 +3077,5 @@
                                (if symp
                                  (! jump-known-symbol)
-                                 (! jump-known-function)))))))))
+                                 (! jump-known-function))))))))
               ;; The general (funcall) case: we don't know (at compile-time)
               ;; for sure whether we've got a symbol or a (local, constant)
@@ -3352,9 +3349,11 @@
                               address-reg))
 
-(defun x862-push-reg-for-form (seg form suggested)
+(defun x862-push-reg-for-form (seg form suggested &optional targeted)
   (let* ((reg (if (and (node-reg-p suggested)
                          (nx2-acode-call-p form))     ;probably ...
                 (x862-one-targeted-reg-form seg form *x862-arg-z*)
-                (x862-one-untargeted-reg-form seg form suggested))))
+                (if targeted
+                  (x862-one-targeted-reg-form seg form suggested)
+                  (x862-one-untargeted-reg-form seg form suggested)))))
     (x862-push-register seg reg)))
 
@@ -3594,5 +3593,5 @@
         (if atriv
           (x862-one-targeted-reg-form seg aform areg)
-          (setq apushed (x862-push-reg-for-form seg aform areg))))
+          (setq apushed (x862-push-reg-for-form seg aform areg t))))
       (x862-one-targeted-reg-form seg bform breg)
       (if aconst
@@ -3666,9 +3665,9 @@
       (if atriv
         (x862-one-targeted-reg-form seg aform areg)
-        (setq apushed (x862-push-reg-for-form seg aform areg))))
+        (setq apushed (x862-push-reg-for-form seg aform areg t))))
     (if (and bform (not bconst))
       (if btriv
         (x862-one-targeted-reg-form seg bform breg)
-        (setq bpushed (x862-push-reg-for-form seg bform breg))))
+        (setq bpushed (x862-push-reg-for-form seg bform breg t))))
     (x862-one-targeted-reg-form seg cform creg)
     (unless btriv 
@@ -3726,13 +3725,13 @@
       (if atriv
         (x862-one-targeted-reg-form seg aform areg)
-        (setq apushed (x862-push-reg-for-form seg aform areg))))
+        (setq apushed (x862-push-reg-for-form seg aform areg t))))
     (if (and bform (not bconst))
       (if btriv
         (x862-one-targeted-reg-form seg bform breg)
-        (setq bpushed (x862-push-reg-for-form seg bform breg))))
+        (setq bpushed (x862-push-reg-for-form seg bform breg t))))
     (if (and cform (not cconst))
       (if ctriv
         (x862-one-targeted-reg-form seg cform creg)
-        (setq cpushed (x862-push-reg-for-form seg cform creg))))
+        (setq cpushed (x862-push-reg-for-form seg cform creg t))))
     (x862-one-targeted-reg-form seg dform dreg)
     (unless ctriv
@@ -4051,10 +4050,11 @@
                    (var (nx2-lexical-reference-p form))
                    (ea (when var
-                         (unless (x862-existing-reg-for-var var) (var-ea var))))
+                         (unless (x862-existing-reg-for-var var)
+                           (when (eql 1 (var-refs var)) (var-ea var)))))
                    (offset (and ea
                                 (memory-spec-p ea)
                                 (not (addrspec-vcell-p ea))
                                 (memspec-frame-address-offset ea)))
-                   (reg (unless offset (x862-one-untargeted-reg-form seg (if js32 i j) *x862-arg-z*)))
+                   (reg (unless (and offset nil) (x862-one-untargeted-reg-form seg (if js32 i j) *x862-arg-z*)))
                    (constant (or js32 is32)))
               (if offset
@@ -6515,8 +6515,8 @@
               (:x8632
                *x8632-nvrs*)))))
-        (@ (backend-get-next-label)) ; generic self-reference label, should be label #1
+        (@ (backend-get-next-label))    ; generic self-reference label, should be label #1
         (! establish-fn)
         (@ (backend-get-next-label))    ; self-call label
-	(when keys ;; Ensure keyvect is the first immediate
+	(when keys;; Ensure keyvect is the first immediate
 	  (x86-immediate-label (%cadr (%cdddr keys))))
         (when code-note
@@ -6648,10 +6648,24 @@
                 (rplacd constant reg)
                 (! ref-constant reg (x86-immediate-label (car constant))))))
-          (when (and (not (or opt rest keys))
-                     (<= max-args *x862-target-num-arg-regs*)
-                     (not (some #'null arg-regs)))
-            (setq *x862-tail-vsp* *x862-vstack*
-                  *x862-tail-nargs* max-args)
-            (@ (setq *x862-tail-label* (backend-get-next-label))))
+          (when (and (not (or opt rest keys method-var))
+                     (logbitp $fbittailcallsself (afunc-bits *x862-cur-afunc*))
+                     (<= max-args (1+ *x862-target-num-arg-regs*))
+                     (dolist (var rev-fixed t)
+                       (let* ((bits (nx-var-bits var)))
+                         (declare (fixnum bits))
+                         (when (or (logbitp $vbitspecial bits)
+                                   (eql (logior (ash 1 $vbitclosed)
+                                                (ash 1 $vbitsetq))
+                                        (logand bits (logior (ash 1 $vbitclosed)
+                                                             (ash 1 $vbitsetq)))))
+                           (return)))))
+            (setq *x862-tail-nargs* max-args
+                  *x862-tail-arg-vars* (reverse rev-fixed)
+                  *x862-tail-vsp* *x862-vstack*)
+            (let* ((stack-arg-var (if (> max-args *x862-target-num-arg-regs*)
+                                    (car *x862-tail-arg-vars*))))
+              (when (and stack-arg-var (not (var-nvr stack-arg-var)))
+                (x862-stack-to-register seg (x862-vloc-ea 0) *x862-temp0*)))
+            (setq *x862-tail-label* (backend-get-next-label)))
           (when method-var
 	    (target-arch-case
@@ -6690,4 +6704,6 @@
           (setq reserved-lcells (x862-collect-lcells :reserved))
           (x862-bind-lambda seg reserved-lcells req opt rest keys auxen optsupvloc arg-regs lexprp inherited-vars)
+          (when *x862-tail-label*
+            (@+ *x862-tail-label*))
           (when next-method-var-scope-info
             (push next-method-var-scope-info *x862-recorded-symbols*)))
@@ -7500,5 +7516,40 @@
 (defx862 x862-self-call self-call (seg vreg xfer arglist &optional spread-p)
   (setq arglist (x862-augment-arglist *x862-cur-afunc* arglist (if spread-p 1 *x862-target-num-arg-regs*)))
-  (x862-call-fn seg vreg xfer -2 arglist spread-p))
+  (let* ((nargs *x862-tail-nargs*))
+    (if (and nargs (x862-tailcallok xfer) (not spread-p)
+             (eql nargs (+ (length (car arglist))
+                           (length (cadr arglist)))))
+      (let* ((forms (append (car arglist) (reverse (cadr arglist))))
+             (vars *x862-tail-arg-vars*)
+             (regs (ecase nargs
+                     (0 ())
+                     (1 (list ($ *x862-arg-z*)))
+                     (2 (list ($ *x862-arg-y*) ($ *x862-arg-z*)))
+                     (3 (list (target-arch-case
+                               (:x8632 ($ x8632::temp0))
+                               (:x8664 ($ x8664::arg_x)))
+                              ($ *x862-arg-y*) ($ *x862-arg-z*)))
+                     (4 (target-arch-case
+                         (:x8632 (compiler-bug "4 tail-call args on x8632"))
+                         (:x8664 (list ($ x8664::temp0)
+                                       ($ x8664::arg_x)
+                                       ($ x8664::arg_y)
+                                       ($ x8664::arg_z))))))))
+        (case nargs
+          (1 (x862-one-targeted-reg-form seg (car forms) (car regs)))
+          (2 (x862-two-targeted-reg-forms seg (car forms) (car regs) (cadr forms) (cadr regs)))
+          (3 (x862-three-targeted-reg-forms seg (car forms) (car regs) (cadr forms) (cadr regs) (caddr forms) (caddr regs)))
+          (4 (x862-four-targeted-reg-forms seg (car forms) (car regs) (cadr forms) (cadr regs)  (caddr forms) (caddr regs) (cadddr forms) (cadddr regs))))
+        (do* ((vars vars (cdr vars))
+              (regs regs (cdr regs)))
+             ((null vars))
+          (let* ((var (car vars))
+                 (reg (car regs)))
+            (x862-do-lexical-setq seg nil (var-ea var) reg)))
+        (let* ((diff (- *x862-vstack* *x862-tail-vsp*)))
+          (unless (eql 0 diff)
+            (! adjust-vsp diff))
+          (! jump (aref *backend-labels* *x862-tail-label*))))
+      (x862-call-fn seg vreg xfer -2 arglist spread-p))))
 
 
Index: /trunk/source/compiler/nx2.lisp
===================================================================
--- /trunk/source/compiler/nx2.lisp	(revision 15049)
+++ /trunk/source/compiler/nx2.lisp	(revision 15050)
@@ -30,5 +30,4 @@
 
 (defun nx2-partition-vars (vars inherited-vars &optional (afunc-flags 0))
-  (declare (ignorable afunc-flags))
   (labels ((var-weight (var)
              (let* ((bits (nx-var-bits var)))
@@ -42,5 +41,8 @@
                               (logand bits (logior (ash 1 $vbitclosed) (ash 1 $vbitsetq)))))
                    0
-                   (var-refs var))
+                   (let* ((w (var-refs var)))
+                     (if (logbitp $fbittailcallsself afunc-flags)
+                       (ash w 2)
+                       w)))
                  0)))
            (sum-weights (varlist)