diff options
| author | Mike Pall <mike> | 2013-12-09 00:32:08 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-12-09 00:32:08 +0100 |
| commit | 585dd449b5d2a9599d268033cd3f62ce63a6be80 (patch) | |
| tree | 3b97afa99f22f8ff30d3f825d7911a4c662acb1d /src | |
| parent | 5c7db3c4fc0f33c4e437aa4235ef557197b9235c (diff) | |
| parent | 0ded8e82a88fadb40b4dd7e6632311781f1b2f91 (diff) | |
| download | luajit-585dd449b5d2a9599d268033cd3f62ce63a6be80.tar.gz luajit-585dd449b5d2a9599d268033cd3f62ce63a6be80.tar.bz2 luajit-585dd449b5d2a9599d268033cd3f62ce63a6be80.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/lj_record.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lj_record.c b/src/lj_record.c index 3d146cf1..ce9e20de 100644 --- a/src/lj_record.c +++ b/src/lj_record.c | |||
| @@ -1471,6 +1471,7 @@ static void check_call_unroll(jit_State *J, TraceNo lnk) | |||
| 1471 | int32_t count = 0; | 1471 | int32_t count = 0; |
| 1472 | if ((J->pt->flags & PROTO_VARARG)) depth--; /* Vararg frame still missing. */ | 1472 | if ((J->pt->flags & PROTO_VARARG)) depth--; /* Vararg frame still missing. */ |
| 1473 | for (; depth > 0; depth--) { /* Count frames with same prototype. */ | 1473 | for (; depth > 0; depth--) { /* Count frames with same prototype. */ |
| 1474 | if (frame_iscont(frame)) depth--; | ||
| 1474 | frame = frame_prev(frame); | 1475 | frame = frame_prev(frame); |
| 1475 | if (mref(frame_func(frame)->l.pc, void) == pc) | 1476 | if (mref(frame_func(frame)->l.pc, void) == pc) |
| 1476 | count++; | 1477 | count++; |