src/method-proto.lisp: Collect arguments in vanilla delegation trampolines.

In the keyword-arguments overhaul, somehow the case in `make-trampoline'
for trivially `augmenting' the argument list for a vanilla message, as
opposed to hairy varargs or keyword messages, got lost, with the result
that they ended up with no arguments at all.  Needless to say, the C
compiler is unhappy about this.

diff --git a/src/method-proto.lisp b/src/method-proto.lisp
index d2ab7610f298596b5c3963e0173d05e1b674bba8..034768a489b325d68c2cb5e4874bb1f55b1723d0 100644 (file)
--- a/src/method-proto.lisp
+++ b/src/method-proto.lisp
@@ -478,7 +478,8 @@ (defun make-trampoline (codegen super body)
                          ((keyword-message-p message)
                           (cons (make-argument *sod-key-pointer*
                                                (c-type (* (void :const))))
                          ((keyword-message-p message)
                           (cons (make-argument *sod-key-pointer*
                                                (c-type (* (void :const))))

-                                raw-args))))
+                                raw-args))
+                         (t raw-args)))

         (*keyword-struct-disposition* (if (effective-method-keywords method)
                                           :pointer :null)))
     (codegen-push codegen)
         (*keyword-struct-disposition* (if (effective-method-keywords method)
                                           :pointer :null)))
     (codegen-push codegen)

diff --git a/test/test.sod b/test/test.sod
index 848a7d32d81c06d0689b0c513848718a924c4da7..429e384595212d469dfcdfd92d9cb1bf50912ab9 100644 (file)
--- a/test/test.sod
+++ b/test/test.sod
@@ -161,6 +161,8 @@ static int check_vec(struct vec *v, ...)
 
 [link = SodObject, nick = base]
 class T1Base: SodObject {
 
 [link = SodObject, nick = base]
 class T1Base: SodObject {

+  int plain(int x) { STEP(x); return (x + 1); }
+

   [combination = progn] void aprogn();
   [combination = sum] int asum();
   [combination = and] int aand();
   [combination = progn] void aprogn();
   [combination = sum] int asum();
   [combination = and] int aand();


@@ -184,6 +186,7 @@ class T1Base: SodObject {
 
 [link = T1Base, nick = mid]
 class T1Mid: T1Base {
 
 [link = T1Base, nick = mid]
 class T1Mid: T1Base {

+  int base.plain(int x) { STEP(x - 1); return (CALL_NEXT_METHOD); }

   void base.aprogn() { STEP(1); }
   int base.asum() { return 1; }
   int base.aand() { return 8; }
   void base.aprogn() { STEP(1); }
   int base.asum() { return 1; }
   int base.aand() { return 8; }


@@ -215,7 +218,8 @@ code c: tests {
     if (!l) STEP(5);
     v = T1Base_avec(t1);
     if (!v.n) STEP(6);
     if (!l) STEP(5);
     v = T1Base_avec(t1);
     if (!v.n) STEP(6);

-    DONE(7);
+    STEP(T1Base_plain(t1, 7)); /* 7, 8 */
+    DONE(9);

   }
   prepare("aggregate, mid");
   { SOD_DECL(T1Mid, t1, NO_KWARGS);
   }
   prepare("aggregate, mid");
   { SOD_DECL(T1Mid, t1, NO_KWARGS);


@@ -231,7 +235,8 @@ code c: tests {
     v = T1Base_avec(t1);
     if (!check_vec(&v, 19, -1)) STEP(6);
     free_vec(&v);
     v = T1Base_avec(t1);
     if (!check_vec(&v, 19, -1)) STEP(6);
     free_vec(&v);

-    DONE(7);
+    STEP(T1Base_plain(t1, 8)); /* 7, 8, 9 */
+    DONE(10);

   }
   prepare("aggregate, sub");
   { SOD_DECL(T1Sub, t1, NO_KWARGS);
   }
   prepare("aggregate, sub");
   { SOD_DECL(T1Sub, t1, NO_KWARGS);