Changeset 12411

Timestamp:

01/31/10 20:13:07 (11 years ago)

Author:

astalla

Message:

Lambda call inlining: fixed nasty bug that made the compiler go into
infinite recursion when compiling an invalid lambda call.

File:

• trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp (modified) (3 diffs)

trunk/abcl/src/org/armedbear/lisp/compiler-pass1.lisp

@@ -1239 +1239 @@
        ,@body)))
     (lambda-list-mismatch (x)
-      (warn "Invalid function call: ~S (mismatch type: ~A)"
-      form (lambda-list-mismatch-type x))
+      (compiler-warn "Invalid function call: ~S (mismatch type: ~A)"
+         form (lambda-list-mismatch-type x))
       form))
   (if (unsafe-p args)
@@ -1302 +1302 @@
              (setf (compiland-%single-valued-p *current-compiland*) nil)))))
   (p1-default form))
+
+(defun %funcall (fn &rest args)
+  "Dummy FUNCALL wrapper to force p1 not to optimize the call."
+  (apply fn args))
 
 (defknown p1 (t) t)
@@ -1370 +1374 @@
                          (p1-function-call form))))
                  ((and (consp op) (eq (%car op) 'LAMBDA))
-                  (p1 (rewrite-function-call form)))
+      (let ((maybe-optimized-call (rewrite-function-call form)))
+        (if (eq maybe-optimized-call form)
+      (p1 `(%funcall (function ,op) ,@(cdr form)))
+      (p1 maybe-optimized-call))))
                  (t
                   form))))))