X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler%2Frepresent.lisp;h=77fafaef3e1405e55eb654f103e1884190952fff;hb=f9d6d21a7f54638292214ceb9886edc03b99d545;hp=3f049b36f5210bcaa5a06a82d4e0325cc3ea8d48;hpb=416152f084604094445a758ff399871132dff2bd;p=sbcl.git diff --git a/src/compiler/represent.lisp b/src/compiler/represent.lisp index 3f049b3..77fafae 100644 --- a/src/compiler/represent.lisp +++ b/src/compiler/represent.lisp @@ -317,13 +317,13 @@ (vop-block (tn-ref-vop ref))))) (tails (lambda-tail-set lambda))) (flet ((frob (fun) - (setf (ir2-environment-number-stack-p - (environment-info - (lambda-environment fun))) + (setf (ir2-physenv-number-stack-p + (physenv-info + (lambda-physenv fun))) t))) (frob lambda) (when tails - (dolist (fun (tail-set-functions tails)) + (dolist (fun (tail-set-funs tails)) (frob fun)))))) (values)) @@ -336,7 +336,7 @@ (let* ((actual (if (eq (tn-kind tn) :alias) (tn-save-tn tn) tn)) (reads (tn-reads tn)) (leaf (tn-leaf actual))) - (cond ((lambda-var-p leaf) (leaf-name leaf)) + (cond ((lambda-var-p leaf) (leaf-source-name leaf)) ((and (not arg-p) reads (return-p (vop-node (tn-ref-vop reads)))) "") @@ -370,12 +370,12 @@ (vop-results op-vop))) (error "couldn't find op? bug!"))))) (compiler-note - "doing ~A (cost ~D)~:[~2*~; ~:[to~;from~] ~S~], for:~%~6T~ + "doing ~A (cost ~W)~:[~2*~; ~:[to~;from~] ~S~], for:~%~6T~ the ~:R ~:[result~;argument~] of ~A" note cost name arg-p name pos arg-p op-note))) (t - (compiler-note "doing ~A (cost ~D)~@[ from ~S~]~@[ to ~S~]" + (compiler-note "doing ~A (cost ~W)~@[ from ~S~]~@[ to ~S~]" note cost (get-operand-name op-tn t) (get-operand-name dest-tn nil))))) (values))