Merge branch 'master' into v2.1

1 files changed, 3 insertions, 2 deletions

diff --git a/src/lj_ccall.c b/src/lj_ccall.c
index 995729b0..80c01938 100644
--- 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. */ \