0.9.10.4: better CONSTANTP

[sbcl.git] / src / pcl / macros.lisp

diff --git a/src/pcl/macros.lisp b/src/pcl/macros.lisp
index f676758..3060a06 100644 (file)
--- a/src/pcl/macros.lisp
+++ b/src/pcl/macros.lisp
@@ -137,11 +137,10 @@
                                    symbol &optional (errorp t) environment)
   (declare (ignore environment))
   (if (and (constantp symbol)
-           (legal-class-name-p (eval symbol))
+           (legal-class-name-p (setf symbol (constant-form-value symbol)))
            (constantp errorp)
            (member *boot-state* '(braid complete)))
-      (let ((symbol (eval symbol))
-            (errorp (not (null (eval errorp))))
+      (let ((errorp (not (null (constant-form-value errorp))))
             (class-cell (make-symbol "CLASS-CELL")))
         `(let ((,class-cell (load-time-value (find-class-cell ',symbol))))
            (or (find-class-cell-class ,class-cell)