X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler%2Faliencomp.lisp;h=7c2fbc0b6b1fc23b33211b1c046f689ded5a6dbf;hb=0dcc957ae6bf24809fda82fd59c134e70058c42a;hp=7018c33b31e900928abaa0bfd3252789b0eb7e56;hpb=cfb9e3640e34706acdfccd26236024de259f3b4f;p=sbcl.git

diff --git a/src/compiler/aliencomp.lisp b/src/compiler/aliencomp.lisp
index 7018c33..7c2fbc0 100644
--- a/src/compiler/aliencomp.lisp
+++ b/src/compiler/aliencomp.lisp
@@ -384,7 +384,7 @@
 			     (specifier-type
 			      (compute-alien-rep-type
 			       (local-alien-info-type info))))))))
-  'nil)
+  nil)
 
 (deftransform local-alien ((info var) * * :important t)
   (unless (constant-continuation-p info)
@@ -485,6 +485,8 @@
 
 (deftransform %sap-alien ((sap type) * * :important t)
   (give-up-ir1-transform
+   ;; FIXME: The hardcoded newline here causes more-than-usually
+   ;; screwed-up formatting of the optimization note output.
    "could not optimize away %SAP-ALIEN: forced to do runtime ~@
     allocation of alien-value structure"))
 
@@ -667,10 +669,9 @@
 	       #!-x86 (temp-tn (make-representation-tn (tn-primitive-type tn)
 						       scn))
 	       (move-arg-vops (svref (sc-move-arg-vops sc) scn)))
-	  (assert arg)
-	  (assert (= (length move-arg-vops) 1) ()
-		  "no unique move-arg-vop for moves in SC ~S"
-		  (sc-name sc))
+	  (aver arg)
+	  (unless (= (length move-arg-vops) 1)
+	    (error "no unique move-arg-vop for moves in SC ~S" (sc-name sc)))
 	  #!+x86 (emit-move-arg-template call
 					 block
 					 (first move-arg-vops)
@@ -688,7 +689,7 @@
 					   temp-tn
 					   nsp
 					   tn))))
-      (assert (null args))
+      (aver (null args))
       (unless (listp result-tns)
 	(setf result-tns (list result-tns)))
       (vop* call-out call block