diff options
| author | Mike Pall <mike> | 2014-01-19 13:12:23 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-01-19 13:12:23 +0100 |
| commit | 4e78b9bb126a3c4a3d27770664452039419d339b (patch) | |
| tree | 4f0243e7921a83cda91f4617f155474c7d6aa637 /src/lj_snap.c | |
| parent | a9d454360161d80310753dafa0d945eea4d98fde (diff) | |
| parent | 926686ad3ddb51e4c74294854946b085ac50373b (diff) | |
| download | luajit-4e78b9bb126a3c4a3d27770664452039419d339b.tar.gz luajit-4e78b9bb126a3c4a3d27770664452039419d339b.tar.bz2 luajit-4e78b9bb126a3c4a3d27770664452039419d339b.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_snap.c')
| -rw-r--r-- | src/lj_snap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_snap.c b/src/lj_snap.c index 4ca8cb15..cc498c89 100644 --- a/src/lj_snap.c +++ b/src/lj_snap.c | |||
| @@ -709,7 +709,7 @@ static void snap_unsink(jit_State *J, GCtrace *T, ExitState *ex, | |||
| 709 | ir->o == IR_CNEW || ir->o == IR_CNEWI); | 709 | ir->o == IR_CNEW || ir->o == IR_CNEWI); |
| 710 | #if LJ_HASFFI | 710 | #if LJ_HASFFI |
| 711 | if (ir->o == IR_CNEW || ir->o == IR_CNEWI) { | 711 | if (ir->o == IR_CNEW || ir->o == IR_CNEWI) { |
| 712 | CTState *cts = ctype_ctsG(J2G(J)); | 712 | CTState *cts = ctype_cts(J->L); |
| 713 | CTypeID id = (CTypeID)T->ir[ir->op1].i; | 713 | CTypeID id = (CTypeID)T->ir[ir->op1].i; |
| 714 | CTSize sz = lj_ctype_size(cts, id); | 714 | CTSize sz = lj_ctype_size(cts, id); |
| 715 | GCcdata *cd = lj_cdata_new(cts, id, sz); | 715 | GCcdata *cd = lj_cdata_new(cts, id, sz); |