X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Fhost-alieneval.lisp;h=647dc3975be2c43ee15c4436a387ccbc10b2f7e7;hb=86210c4e406c1b2ff10cc3bac0e71435867db48b;hp=0a263e11fa5a7f5eb9621609dc839ff3b1c2b67b;hpb=78a057624fecd10d0fb2ead4ef02ffc361b1ee22;p=sbcl.git

diff --git a/src/code/host-alieneval.lisp b/src/code/host-alieneval.lisp
index 0a263e1..647dc39 100644
--- a/src/code/host-alieneval.lisp
+++ b/src/code/host-alieneval.lisp
@@ -115,7 +115,9 @@
 			       ,@(mapcar (lambda (x)
 					   (if (atom x) x (car x)))
 					 slots)
-			       ,@include-args)))
+			       ,@include-args
+			       ;; KLUDGE
+			       &aux (alignment (or alignment (guess-alignment bits))))))
 	   ,@slots)))))
 
 (def!macro define-alien-type-method ((class method) lambda-list &rest body)
@@ -322,10 +324,11 @@
 
 (def!struct (alien-type
 	     (:make-load-form-fun sb!kernel:just-dump-it-normally)
-	     (:constructor make-alien-type (&key class bits alignment)))
+	     (:constructor make-alien-type (&key class bits alignment
+					    &aux (alignment (or alignment (guess-alignment bits))))))
   (class 'root :type symbol)
   (bits nil :type (or null unsigned-byte))
-  (alignment (guess-alignment bits) :type (or null unsigned-byte)))
+  (alignment nil :type (or null unsigned-byte)))
 (def!method print-object ((type alien-type) stream)
   (print-unreadable-object (type stream :type t)
     (prin1 (unparse-alien-type type) stream)))
@@ -760,7 +763,7 @@
 
 #!+long-float
 (define-alien-type-class (long-float :include (float (bits #!+x86 96
-							    #!+sparc 128))
+							   #!+sparc 128))
 				     :include-args (type)))
 
 #!+long-float
@@ -1137,14 +1140,15 @@
 (def!struct (local-alien-info
 	     (:make-load-form-fun sb!kernel:just-dump-it-normally)
 	     (:constructor make-local-alien-info
-			   (&key type force-to-memory-p)))
+			   (&key type force-to-memory-p
+			    &aux (force-to-memory-p (or force-to-memory-p
+							(alien-array-type-p type)
+							(alien-record-type-p type))))))
   ;; the type of the local alien
   (type (missing-arg) :type alien-type)
   ;; Must this local alien be forced into memory? Using the ADDR macro
   ;; on a local alien will set this.
-  (force-to-memory-p (or (alien-array-type-p type)
-			 (alien-record-type-p type))
-		     :type (member t nil)))
+  (force-to-memory-p nil :type (member t nil)))
 (def!method print-object ((info local-alien-info) stream)
   (print-unreadable-object (info stream :type t)
     (format stream