...
 
Commits (2)
......@@ -1947,6 +1947,9 @@ resize_string_data (Lisp_Object string, ptrdiff_t cidx_byte,
/* No need to reallocate, as the size change falls within the
alignment slop. */
XSTRING (string)->u.s.size_byte = new_nbytes;
#ifdef GC_CHECK_STRING_BYTES
SDATA_NBYTES (old_sdata) = new_nbytes;
#endif
new_charaddr = data + cidx_byte;
memmove (new_charaddr + new_clen, new_charaddr + clen,
nbytes - (cidx_byte + (clen - 1)));
......@@ -4638,8 +4641,10 @@ mark_maybe_object (Lisp_Object obj)
break;
}
void *po = (char *) ((intptr_t) (char *) XLP (obj)
+ (offset - LISP_WORD_TAG (type_tag)));
bool overflow
= INT_SUBTRACT_WRAPV (offset, LISP_WORD_TAG (type_tag), &offset);
eassert (!overflow);
void *po = (char *) ((intptr_t) (char *) XLP (obj) + offset);
/* If the pointer is in the dump image and the dump has a record
of the object starting at the place where the pointer points, we
......