Optimize EQUALP on structures with raw slots.

[sbcl.git] / src / code / target-defstruct.lisp

diff --git a/src/code/target-defstruct.lisp b/src/code/target-defstruct.lisp
index f397731..2295453 100644 (file)
--- a/src/code/target-defstruct.lisp
+++ b/src/code/target-defstruct.lisp
@@ -401,13 +401,14 @@
                     (find raw-type
                           *raw-slot-data-list*
                           :key 'raw-slot-data-raw-type))
-        for accessor = (when rsd
-                         (raw-slot-data-accessor-name rsd))
-        always (or (not accessor)
-                   (prog1
-                       (equalp (funcall accessor x i)
-                               (funcall accessor y i))
-                     (incf i (raw-slot-data-n-words rsd))))))
+        always (or (not rsd)
+                   (progn
+                     #!-(or x86 x86-64 ppc)
+                     (setf i (logandc2 (+ i (1- (raw-slot-data-alignment rsd)))
+                                       (1- (raw-slot-data-alignment rsd))))
+                     (prog1
+                         (funcall (raw-slot-data-comparer rsd) i x y)
+                       (incf i (raw-slot-data-n-words rsd)))))))
 \f
 ;;; default PRINT-OBJECT method