X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-ir2tran.lisp;h=c9e064aaecf3385078d71615ad78dd6a27ab8aa7;hb=b9e94e326f79ab01e56cb437e424ce5ea489471f;hp=2c9320e3c61b920e2aec4051fae7fbabb9bf814a;hpb=1a3143cca7d6678c094b6bacc485e8531808ea59;p=sbcl.git

diff --git a/src/compiler/generic/vm-ir2tran.lisp b/src/compiler/generic/vm-ir2tran.lisp
index 2c9320e..c9e064a 100644
--- a/src/compiler/generic/vm-ir2tran.lisp
+++ b/src/compiler/generic/vm-ir2tran.lisp
@@ -33,7 +33,8 @@
     (move-lvar-result node block (list value-tn) (node-lvar node))))
 
 (defun emit-inits (node block name result lowtag inits args)
-  (let ((unbound-marker-tn nil))
+  (let ((unbound-marker-tn nil)
+        (funcallable-instance-tramp-tn nil))
     (dolist (init inits)
       (let ((kind (car init))
             (slot (cdr init)))
@@ -51,7 +52,15 @@
                             (vop make-unbound-marker node block tn)
                             tn))))
                (:null
-                (emit-constant nil)))
+                (emit-constant nil))
+               (:funcallable-instance-tramp
+                (or funcallable-instance-tramp-tn
+                    (setf funcallable-instance-tramp-tn
+                          (let ((tn (make-restricted-tn
+                                     nil
+                                     (sc-number-or-lose 'sb!vm::any-reg))))
+                            (vop make-funcallable-instance-tramp node block tn)
+                            tn)))))
              name slot lowtag))))
   (aver (null args)))
 
@@ -61,8 +70,7 @@
 (defoptimizer ir2-convert-fixed-allocation
               ((&rest args) node block name words type lowtag inits)
   (let* ((lvar (node-lvar node))
-         (locs (lvar-result-tns lvar
-                                        (list *backend-t-primitive-type*)))
+         (locs (lvar-result-tns lvar (list *backend-t-primitive-type*)))
          (result (first locs)))
     (emit-fixed-alloc node block name words type lowtag result)
     (emit-inits node block name result lowtag inits args)
@@ -71,8 +79,7 @@
 (defoptimizer ir2-convert-variable-allocation
               ((extra &rest args) node block name words type lowtag inits)
   (let* ((lvar (node-lvar node))
-         (locs (lvar-result-tns lvar
-                                        (list *backend-t-primitive-type*)))
+         (locs (lvar-result-tns lvar (list *backend-t-primitive-type*)))
          (result (first locs)))
     (if (constant-lvar-p extra)
         (let ((words (+ (lvar-value extra) words)))