X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Finterr.lisp;h=e00663d5006aa6dc2291addb4ca8e01f95943ba4;hb=95591ed483dbb8c0846c129953acac1554f28809;hp=c3f039f838cb0c53ac0709ff56d89db7c69ad025;hpb=08d05510b51708853ca998154d8096b21d85edab;p=sbcl.git

diff --git a/src/code/interr.lisp b/src/code/interr.lisp
index c3f039f..e00663d 100644
--- a/src/code/interr.lisp
+++ b/src/code/interr.lisp
@@ -236,12 +236,14 @@
          :operands (list this that)))
 
 (deferr object-not-type-error (object type)
-  (error (if (and (%instancep object)
-                  (layout-invalid (%instance-layout object)))
-             'layout-invalid
-             'type-error)
-         :datum object
-         :expected-type type))
+  (if (invalid-array-p object)
+      (invalid-array-error object)
+      (error (if (and (%instancep object)
+                      (layout-invalid (%instance-layout object)))
+                 'layout-invalid
+                 'type-error)
+             :datum object
+             :expected-type type)))
 
 (deferr layout-invalid-error (object layout)
   (error 'layout-invalid