diff options
| author | Mike Pall <mike> | 2015-07-17 23:17:34 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2015-07-17 23:17:34 +0200 |
| commit | 0dcd2d129241964925e27831fa61194a8dbe6191 (patch) | |
| tree | f8834f0740939acca584a292ea0fd36724b29a3d /src | |
| parent | ba6344d1ef4b3013dc83b434df2610fe8dbf5617 (diff) | |
| parent | a5b1c4d98eeb97a950774ae032f51f820dfbfc4c (diff) | |
| download | luajit-0dcd2d129241964925e27831fa61194a8dbe6191.tar.gz luajit-0dcd2d129241964925e27831fa61194a8dbe6191.tar.bz2 luajit-0dcd2d129241964925e27831fa61194a8dbe6191.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/lj_cparse.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lj_cparse.c b/src/lj_cparse.c index 1ec32307..f212bd36 100644 --- a/src/lj_cparse.c +++ b/src/lj_cparse.c | |||
| @@ -784,6 +784,10 @@ static void cp_push_type(CPDecl *decl, CTypeID id) | |||
| 784 | cp_push(decl, info & ~CTMASK_CID, size); /* Copy type. */ | 784 | cp_push(decl, info & ~CTMASK_CID, size); /* Copy type. */ |
| 785 | break; | 785 | break; |
| 786 | case CT_ARRAY: | 786 | case CT_ARRAY: |
| 787 | if ((ct->info & (CTF_VECTOR|CTF_COMPLEX))) { | ||
| 788 | info |= (decl->attr & CTF_QUAL); | ||
| 789 | decl->attr &= ~CTF_QUAL; | ||
| 790 | } | ||
| 787 | cp_push_type(decl, ctype_cid(info)); /* Unroll. */ | 791 | cp_push_type(decl, ctype_cid(info)); /* Unroll. */ |
| 788 | cp_push(decl, info & ~CTMASK_CID, size); /* Copy type. */ | 792 | cp_push(decl, info & ~CTMASK_CID, size); /* Copy type. */ |
| 789 | decl->stack[decl->pos].sib = 1; /* Mark as already checked and sized. */ | 793 | decl->stack[decl->pos].sib = 1; /* Mark as already checked and sized. */ |