mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-27 15:52:00 -08:00
Code Issues Projects Releases Wiki Activity

Provide backtrace for byte-ops aref and aset

Browse source 
Produce synthetic backtrace entries for `aref` and `aset` byte-ops
when the index is non-fixnum, or is out of range for vector or record
arguments (bug#64613).

* src/bytecode.c (exec_byte_code): Detect type and range errors
in-line for aref and aset.
* src/data.c (syms_of_data): Declare symbols Qaref and Qaset.
* test/lisp/emacs-lisp/bytecomp-tests.el
(bytecomp-tests--byte-op-error-cases): Add test cases.
This commit is contained in:
Mattias Engdegård 2023-07-25 12:16:30 +02:00
parent c50f6538cf
commit 82f5f3b8a2
3 changed files with 46 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/bytecode.c
View file

@ -1115,14 +1115,24 @@ exec_byte_code (Lisp_Object fun, ptrdiff_t args_template,
{
Lisp_Object idxval = POP;
Lisp_Object arrayval = TOP;
if (!FIXNUMP (idxval))
{
record_in_backtrace (Qaref, &TOP, 2);
wrong_type_argument (Qfixnump, idxval);
}
ptrdiff_t size;
ptrdiff_t idx;
if (((VECTORP (arrayval) && (size = ASIZE (arrayval), true))
|| (RECORDP (arrayval) && (size = PVSIZE (arrayval), true)))
&& FIXNUMP (idxval)
&& (idx = XFIXNUM (idxval),
idx >= 0 && idx < size))
TOP = AREF (arrayval, idx);
|| (RECORDP (arrayval) && (size = PVSIZE (arrayval), true))))
{
ptrdiff_t idx = XFIXNUM (idxval);
if (idx >= 0 && idx < size)
TOP = AREF (arrayval, idx);
else
{
record_in_backtrace (Qaref, &TOP, 2);
args_out_of_range (arrayval, idxval);
}
}
else
TOP = Faref (arrayval, idxval);
NEXT;
@ -1133,16 +1143,26 @@ exec_byte_code (Lisp_Object fun, ptrdiff_t args_template,
Lisp_Object newelt = POP;
Lisp_Object idxval = POP;
Lisp_Object arrayval = TOP;
ptrdiff_t size;
ptrdiff_t idx;
if (((VECTORP (arrayval) && (size = ASIZE (arrayval), true))
|| (RECORDP (arrayval) && (size = PVSIZE (arrayval), true)))
&& FIXNUMP (idxval)
&& (idx = XFIXNUM (idxval),
idx >= 0 && idx < size))
if (!FIXNUMP (idxval))
{
ASET (arrayval, idx, newelt);
TOP = newelt;
record_in_backtrace (Qaset, &TOP, 3);
wrong_type_argument (Qfixnump, idxval);
}
ptrdiff_t size;
if (((VECTORP (arrayval) && (size = ASIZE (arrayval), true))
|| (RECORDP (arrayval) && (size = PVSIZE (arrayval), true))))
{
ptrdiff_t idx = XFIXNUM (idxval);
if (idx >= 0 && idx < size)
{
ASET (arrayval, idx, newelt);
TOP = newelt;
}
else
{
record_in_backtrace (Qaset, &TOP, 3);
args_out_of_range (arrayval, idxval);
}
}
else
TOP = Faset (arrayval, idxval, newelt);