From ef71dc437fdcdf61d61519e5197c6e3016d8f3a5 Mon Sep 17 00:00:00 2001
From: Zach Shaftel
Date: Fri, 1 May 2020 14:56:46 -0400
Subject: Print offset of each backtrace frame

---
 src/bytecode.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/bytecode.c')

diff --git a/src/bytecode.c b/src/bytecode.c
index 1c98a516dbb..b4b5ef6e60a 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -286,13 +286,12 @@ enum byte_code_op
 
 /* Fetch the next byte from the bytecode stream.  */
 
-#define FETCH (last_pc = pc, *pc++)
-#define FETCH_NORECORD (*pc++)
+#define FETCH (*pc++)
 
 /* Fetch two bytes from the bytecode stream and make a 16-bit number
    out of them.  */
 
-#define FETCH2 (op = FETCH, op + (FETCH_NORECORD << 8))
+#define FETCH2 (op = FETCH, op + (FETCH << 8))
 
 /* Push X onto the execution stack.  The expression X should not
    contain TOP, to avoid competing side effects.  */
@@ -376,7 +375,6 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
   bytestr_data = ptr_bounds_clip (bytestr_data + item_bytes, bytestr_length);
   memcpy (bytestr_data, SDATA (bytestr), bytestr_length);
   unsigned char const *pc = bytestr_data;
-  unsigned char const *last_pc = pc;
   ptrdiff_t count = SPECPDL_INDEX ();
 
   if (!NILP (args_template))
@@ -538,7 +536,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
 	    if (CONSP (TOP))
 	      TOP = XCDR (TOP);
 	    else if (!NILP (TOP))
-	      wrong_type_argument_new (Qlistp, TOP, last_pc - bytestr_data);
+	      wrong_type_argument (Qlistp, TOP);
 	    NEXT;
 	  }
 
-- 
cgit v1.2.1