Merge branches 'mdw/kwargs-fixes' and 'mdw/c11-fixes'

[sod] / src / method-proto.lisp

diff --git a/src/method-proto.lisp b/src/method-proto.lisp
index 41e6354..60a10eb 100644 (file)
--- a/src/method-proto.lisp
+++ b/src/method-proto.lisp
@@ -292,15 +292,13 @@
        (convert-stmts codegen target
                       (c-type-subtype (sod-method-type direct-method))
                       (lambda (var)
-                        (ensure-var codegen *sod-tmp-ap* (c-type va-list))
-                        (emit-inst codegen
-                                   (make-va-copy-inst *sod-tmp-ap*
-                                                      *sod-ap*))
-                        (deliver-expr codegen var
-                                      (make-call-inst function arguments))
-                        (emit-inst codegen
-                                   (make-va-end-inst *sod-tmp-ap*))))
-       (deliver-expr codegen target (make-call-inst function arguments)))))
+                        (ensure-var codegen *sod-tmp-ap* c-type-va-list)
+                        (deliver-call codegen :void "va_copy"
+                                      *sod-tmp-ap* *sod-ap*)
+                        (apply #'deliver-call codegen var
+                               function arguments)
+                        (deliver-call codegen :void "va_end" *sod-tmp-ap*)))
+       (apply #'deliver-call codegen target function arguments))))
 
 (export 'ensure-ilayout-var)
 (defun ensure-ilayout-var (codegen super)
@@ -338,8 +336,7 @@
         (return-type (c-type-subtype message-type))
         (raw-args (sod-message-argument-tail message))
         (arguments (if (varargs-message-p message)
-                       (cons (make-argument *sod-ap*
-                                            (c-type va-list))
+                       (cons (make-argument *sod-ap* c-type-va-list)
                              (butlast raw-args))
                        raw-args)))
     (codegen-push codegen)
@@ -410,7 +407,7 @@
                   (make-trampoline codegen (sod-method-class method)
                                    (lambda (target)
                                      (invoke chain target)))
-                  0))
+                  *null-pointer*))
             (invoke (chain target)
               (if (null chain)
                   (funcall kernel target)