Merge branch 'master' into v2.1

2013-09-08 13:12:33 +02:00 · 2013-09-08 13:12:33 +02:00 · cb336995a8
commit cb336995a8
parent 0d41601e76 782787f1fa
1 changed files with 3 additions and 2 deletions
--- a/src/lj_ccall.c
+++ b/src/lj_ccall.c
@ -172,9 +172,10 @@

 #define CCALL_HANDLE_REGARG \
  if (isfp) {  /* Try to pass argument in FPRs. */ \
-    if (nfpr + n <= CCALL_NARG_FPR) { \
+    int n2 = ctype_isvector(d->info) ? 1 : n; \
+    if (nfpr + n2 <= CCALL_NARG_FPR) { \
      dp = &cc->fpr[nfpr]; \
-      nfpr += n; \
+      nfpr += n2; \
      goto done; \
    } \
  } else {  /* Try to pass argument in GPRs. */ \