aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
authorPaul Eggert2019-08-14 18:24:02 -0700
committerPaul Eggert2019-08-14 18:24:33 -0700
commit2098e8afaf1c5235ba38c0156f680b8e435d9fdd (patch)
tree2cde909326273f76ae2bb58b7d7cdfa350951058 /src/alloc.c
parentb898528fdc69c9ac58895f8be81163dc304bd59b (diff)
downloademacs-2098e8afaf1c5235ba38c0156f680b8e435d9fdd.tar.gz
emacs-2098e8afaf1c5235ba38c0156f680b8e435d9fdd.zip
Remove INT_ADD_WRAPV bug workarounds
* src/alloc.c (free_cons): * src/casefiddle.c (do_casify_multibyte_string): * src/editfns.c (styled_format): * src/image.c (png_load_body): Remove recent workarounds for INT_ADD_WRAPV bugs since the bugs have been fixed (Bug#37006).
Diffstat (limited to 'src/alloc.c')
-rw-r--r--src/alloc.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 0548a09cb8b..bb8e97f8737 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -2543,10 +2543,7 @@ free_cons (struct Lisp_Cons *ptr)
2543 ptr->u.s.u.chain = cons_free_list; 2543 ptr->u.s.u.chain = cons_free_list;
2544 ptr->u.s.car = dead_object (); 2544 ptr->u.s.car = dead_object ();
2545 cons_free_list = ptr; 2545 cons_free_list = ptr;
2546 /* Use a temporary signed variable, since otherwise INT_ADD_WRAPV 2546 if (INT_ADD_WRAPV (consing_until_gc, sizeof *ptr, &consing_until_gc))
2547 might incorrectly return non-zero. */
2548 int incr = sizeof *ptr;
2549 if (INT_ADD_WRAPV (consing_until_gc, incr, &consing_until_gc))
2550 consing_until_gc = INTMAX_MAX; 2547 consing_until_gc = INTMAX_MAX;
2551 gcstat.total_free_conses++; 2548 gcstat.total_free_conses++;
2552} 2549}