Changeset 15033

Timestamp:

06/01/17 06:46:25 (6 years ago)

Author:

Mark Evenson

Message:

Fix LOOP code size estimation

(Olof-Joachim Frahm)

C.f. ​https://trac.clozure.com/ccl/ticket/1085:

[...] should be (throw 'estimate-code-size nil)

And to note:

(BTW, in SBCL, I fixed this by getting rid of the code size estimation
completely)

Location:

trunk/abcl

Files:

• src/org/armedbear/lisp/loop.lisp (modified) (1 diff)
• test/lisp/abcl/bugs.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/loop.lisp

@@ -768 +768 @@
             (and (consp (cadr x)) (eq (caadr x) 'setf)))
         1
-        ;; FIXME: This tag appears not to be present
-        ;; anywhere.
-        (throw 'duplicatable-code-p nil)))
+        (throw 'estimate-code-size nil)))
          ((eq fn 'multiple-value-setq)
           (f (length (second x)) (cddr x)))

trunk/abcl/test/lisp/abcl/bugs.lisp

@@ -134 +134 @@
   ((0.0 . 0) (0.0 . 1)))
 
+;; http://abcl.org/trac/ticket/444
+;; https://trac.clozure.com/ccl/ticket/1085
+(deftest bugs.loop.2
+    (loop for x = #'(lambda ()) for y = 10 then 20 return y)
+  10)
 
 ;; http://abcl.org/trac/ticket/294