From 6d0c182ac7069b549c80feaa024caed176c4b35f Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Tue, 16 Aug 2005 10:44:40 +0000 Subject: [PATCH] 0.9.3.55: Fix LET-CONVER[ST]ION confusion. ... also adjust ctor commentary to reflect disappearance of INSTANCE-LAMBDA. --- src/compiler/locall.lisp | 4 ++-- src/pcl/ctor.lisp | 10 ---------- tests/compiler-1.impure-cload.lisp | 2 +- version.lisp-expr | 2 +- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/compiler/locall.lisp b/src/compiler/locall.lisp index 1fef35a..ceff522 100644 --- a/src/compiler/locall.lisp +++ b/src/compiler/locall.lisp @@ -1017,11 +1017,11 @@ (when (leaf-has-source-name-p clambda) ;; ANSI requires that explicit NOTINLINE be respected. (or (eq (lambda-inlinep clambda) :notinline) - ;; If (= LET-CONVERTION 0) we can guess that inlining + ;; If (= LET-CONVERSION 0) we can guess that inlining ;; generally won't be appreciated, but if the user ;; specifically requests inlining, that takes precedence over ;; our general guess. - (and (policy clambda (= let-convertion 0)) + (and (policy clambda (= let-conversion 0)) (not (eq (lambda-inlinep clambda) :inline)))))) ;;; We also don't convert calls to named functions which appear in the diff --git a/src/pcl/ctor.lisp b/src/pcl/ctor.lisp index 28637cd..7a981aa 100644 --- a/src/pcl/ctor.lisp +++ b/src/pcl/ctor.lisp @@ -245,16 +245,6 @@ (setf (ctor-class ctor) class) (pushnew ctor (plist-value class 'ctors)) (setf (funcallable-instance-fun ctor) - ;; KLUDGE: Gerd here has the equivalent of (COMPILE NIL - ;; (CONSTRUCTOR-FUNCTION-FORM)), but SBCL's COMPILE doesn't - ;; deal with INSTANCE-LAMBDA expressions, only with LAMBDA - ;; expressions. The below should be equivalent, since we - ;; have a compiler-only implementation. - ;; - ;; (except maybe for optimization qualities? -- CSR, - ;; 2004-07-12) - ;; - ;; FIXME: INSTANCE-LAMBDA is no more. We could change this. (multiple-value-bind (form locations names) (constructor-function-form ctor) (apply (compile nil `(lambda ,names ,form)) locations))))) diff --git a/tests/compiler-1.impure-cload.lisp b/tests/compiler-1.impure-cload.lisp index 5b9c106..5348c91 100644 --- a/tests/compiler-1.impure-cload.lisp +++ b/tests/compiler-1.impure-cload.lisp @@ -209,7 +209,7 @@ (assert (raises-error? (bug231b 0 0) type-error)) ;;; A bug appeared in flaky7_branch. Python got lost in unconverting -;;; embedded tail calls during let-convertion. +;;; embedded tail calls during let-conversion. (defun bug239 (bit-array-2 &optional result-bit-array) (declare (type (array bit) bit-array-2) (type (or (array bit) (member t nil)) result-bit-array)) diff --git a/version.lisp-expr b/version.lisp-expr index 1e47ae0..71384b5 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.9.3.54" +"0.9.3.55" -- 1.7.10.4