projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.6.12.3:
[sbcl.git]
/
src
/
compiler
/
aliencomp.lisp
diff --git
a/src/compiler/aliencomp.lisp
b/src/compiler/aliencomp.lisp
index
ce65019
..
7c2fbc0
100644
(file)
--- a/
src/compiler/aliencomp.lisp
+++ b/
src/compiler/aliencomp.lisp
@@
-10,9
+10,6
@@
;;;; files for more information.
(in-package "SB!C")
;;;; files for more information.
(in-package "SB!C")
-
-(file-comment
- "$Header$")
\f
;;;; DEFKNOWNs
\f
;;;; DEFKNOWNs
@@
-387,7
+384,7
@@
(specifier-type
(compute-alien-rep-type
(local-alien-info-type info))))))))
(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)
(deftransform local-alien ((info var) * * :important t)
(unless (constant-continuation-p info)
@@
-488,6
+485,8
@@
(deftransform %sap-alien ((sap type) * * :important t)
(give-up-ir1-transform
(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"))
\f
"could not optimize away %SAP-ALIEN: forced to do runtime ~@
allocation of alien-value structure"))
\f
@@
-646,12
+645,12
@@
(alien-function-type-result-type type)))))
(defoptimizer (%alien-funcall ltn-annotate)
(alien-function-type-result-type type)))))
(defoptimizer (%alien-funcall ltn-annotate)
- ((function type &rest args) node policy)
+ ((function type &rest args) node ltn-policy)
(setf (basic-combination-info node) :funny)
(setf (node-tail-p node) nil)
(setf (basic-combination-info node) :funny)
(setf (node-tail-p node) nil)
- (annotate-ordinary-continuation function policy)
+ (annotate-ordinary-continuation function ltn-policy)
(dolist (arg args)
(dolist (arg args)
- (annotate-ordinary-continuation arg policy)))
+ (annotate-ordinary-continuation arg ltn-policy)))
(defoptimizer (%alien-funcall ir2-convert)
((function type &rest args) call block)
(defoptimizer (%alien-funcall ir2-convert)
((function type &rest args) call block)
@@
-670,10
+669,9
@@
#!-x86 (temp-tn (make-representation-tn (tn-primitive-type tn)
scn))
(move-arg-vops (svref (sc-move-arg-vops sc) scn)))
#!-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)
#!+x86 (emit-move-arg-template call
block
(first move-arg-vops)
@@
-691,7
+689,7
@@
temp-tn
nsp
tn))))
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
(unless (listp result-tns)
(setf result-tns (list result-tns)))
(vop* call-out call block