diff --git a/src/lj_jit.h b/src/lj_jit.h
index 75f5804b01..66bb48d513 100644
--- a/src/lj_jit.h
+++ b/src/lj_jit.h
@@ -295,6 +295,13 @@ typedef struct FoldState {
   IRIns right[2];	/* Instruction referenced by right operand. */
 } FoldState;
 
+/* Log entry for a bytecode that was recorded. */
+typedef struct BCRecLog {
+  GCproto *pt;		/* Prototype of bytecode function (or NULL). */
+  BCPos pos;		/* Position of bytecode in prototype. */
+  int32_t framedepth;	/* Frame depth when recorded. */
+} BCRecLog;
+
 /* JIT compiler state. */
 typedef struct jit_State {
   GCtrace cur;		/* Current trace. */
@@ -340,6 +347,10 @@ typedef struct jit_State {
   SnapEntry *snapmapbuf;  /* Temp. snapshot map buffer. */
   MSize sizesnapmap;	/* Size of temp. snapshot map buffer. */
 
+  BCRecLog *bclog;	/* Start of of recorded bytecode log. */
+  uint32_t nbclog;	/* Number of logged bytecodes. */
+  uint32_t maxbclog;	/* Max entries in the bytecode log. */
+
   PostProc postproc;	/* Required post-processing after execution. */
   uint8_t retryrec;	/* Retry recording. */
 
diff --git a/src/lj_record.c b/src/lj_record.c
index cce8cf34e0..f4b3c0e0d5 100644
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@ -1864,6 +1864,13 @@ void lj_record_ins(jit_State *J)
   BCOp op;
   TRef ra, rb, rc;
 
+  if (J->nbclog < J->maxbclog) {
+    BCRecLog *log = &J->bclog[J->nbclog++];
+    log->pt = J->pt;
+    log->pos = J->pt ? proto_bcpos(J->pt, J->pc) : -1;
+    log->framedepth = J->framedepth;
+  }
+
   /* Perform post-processing action before recording the next instruction. */
   if (LJ_UNLIKELY(J->postproc != LJ_POST_NONE)) {
     switch (J->postproc) {
@@ -2436,6 +2443,8 @@ void lj_record_setup(jit_State *J)
   J->bc_min = NULL;  /* Means no limit. */
   J->bc_extent = ~(MSize)0;
 
+  J->nbclog = 0;
+
   /* Emit instructions for fixed references. Also triggers initial IR alloc. */
   emitir_raw(IRT(IR_BASE, IRT_PGC), J->parent, J->exitno);
   for (i = 0; i <= 2; i++) {
diff --git a/src/lj_state.c b/src/lj_state.c
index f91f2c41dd..d5fccf6d4b 100644
--- a/src/lj_state.c
+++ b/src/lj_state.c
@@ -168,6 +168,7 @@ static void close_state(lua_State *L)
   lj_mem_freevec(g, g->strhash, g->strmask+1, GCRef);
   lj_buf_free(g, &g->tmpbuf);
   lj_mem_freevec(g, tvref(L->stack), L->stacksize, TValue);
+  lj_mem_free(g, J->bclog, sizeof(BCRecLog)*65536);
   lj_mem_free(g, J->snapmapbuf, J->sizesnapmap);
   lj_mem_free(g, J->snapbuf, J->sizesnap);
   lj_mem_free(g, J->irbuf-REF_BIAS, 65536*sizeof(IRIns));
@@ -216,6 +217,9 @@ LUA_API lua_State *lua_newstate(lua_Alloc f, void *ud)
   J->sizesnapmap = sizeof(SnapEntry)*65536;
   J->snapbuf = (SnapShot *)lj_mem_new(L, J->sizesnap);
   J->snapmapbuf = (SnapEntry *)lj_mem_new(L, J->sizesnapmap);
+  J->maxbclog = 65536;
+  J->bclog = (BCRecLog *)lj_mem_new(L, sizeof(BCRecLog)*J->maxbclog);
+  J->nbclog = 0;
   IRIns *irbufmem = (IRIns *)lj_mem_new(L, sizeof(IRIns)*65536);
   if (irbufmem == NULL || J->snapbuf == NULL || J->snapmapbuf == NULL)
     return NULL;