1.0.13.9: Fix another segfault from the new RESTART-FRAME instrumentation

[sbcl.git] / src / code / eval.lisp

diff --git a/src/code/eval.lisp b/src/code/eval.lisp
index 406dc09..99fea12 100644 (file)
--- a/src/code/eval.lisp
+++ b/src/code/eval.lisp
@@ -20,9 +20,10 @@
   ;; to be careful about not muffling warnings arising from inner
   ;; evaluations/compilations, though [e.g. the ignored variable in
   ;; (DEFUN FOO (X) 1)].  -- CSR, 2003-05-13
-  (let ((fun (sb!c:compile-in-lexenv nil
-                                     `(lambda () ,expr)
-                                     lexenv)))
+  (let* (;; why PROGN?  So that attempts to eval free declarations
+         ;; signal errors rather than return NIL.  -- CSR, 2007-05-01
+         (lambda `(lambda () (progn ,expr)))
+         (fun (sb!c:compile-in-lexenv nil lambda lexenv)))
     (funcall fun)))
 
 ;;; Handle PROGN and implicit PROGN.
@@ -142,7 +143,7 @@
                            (not (consp (let ((sb!c:*lexenv* lexenv))
                                          (sb!c:lexenv-find name funs)))))
                       (%coerce-name-to-fun name)
-                    (%simple-eval original-exp lexenv))))
+                      (%simple-eval original-exp lexenv))))
                ((quote)
                 (unless (= n-args 1)
                   (error "wrong number of args to QUOTE:~% ~S" exp))
@@ -197,9 +198,9 @@
                     ;; PROGN; otherwise, the EVAL-WHEN form returns NIL.
                     (declare (ignore ct lt))
                     (when e
-                    (simple-eval-progn-body body lexenv)))))
+                      (simple-eval-progn-body body lexenv)))))
                ((locally)
-              (simple-eval-locally exp lexenv))
+                (simple-eval-locally exp lexenv))
                ((macrolet)
                 (destructuring-bind (definitions &rest body)
                     (rest exp)
@@ -211,7 +212,7 @@
                               (declare (ignore funs))
                               sb!c:*lexenv*)
                             :eval))))
-                  (simple-eval-locally `(locally ,@body) lexenv))))
+                    (simple-eval-locally `(locally ,@body) lexenv))))
                ((symbol-macrolet)
                 (destructuring-bind (definitions &rest body) (rest exp)
                   (multiple-value-bind (lexenv vars)