aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
authorEli Zaretskii2016-09-14 20:41:04 +0300
committerEli Zaretskii2016-09-14 20:41:04 +0300
commit5ad238bf28f67304b942f03d3d5fc8d14d1268a8 (patch)
tree0a5de6a3f71f27f287f7869a7d38a13f5917203c /src/alloc.c
parentdef4f1ec992880de599d36a0f94536249d95d7c4 (diff)
downloademacs-5ad238bf28f67304b942f03d3d5fc8d14d1268a8.tar.gz
emacs-5ad238bf28f67304b942f03d3d5fc8d14d1268a8.zip
Avoid aborts in GC due to abort_on_gc
* src/lisp.h: * src/print.c (Fprin1_to_string): * src/eval.c (signal_or_quit): * src/alloc.c (garbage_collect_1): Remove declarations, setting, and testing the value of abort_on_gc. It is no longer needed, and using it causes rare aborts in GC for no good reason. (Bug#23912)
Diffstat (limited to 'src/alloc.c')
-rw-r--r--src/alloc.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 5bbd5e55c42..1092a34801a 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -231,12 +231,6 @@ EMACS_INT memory_full_cons_threshold;
231 231
232bool gc_in_progress; 232bool gc_in_progress;
233 233
234/* True means abort if try to GC.
235 This is for code which is written on the assumption that
236 no GC will happen, so as to verify that assumption. */
237
238bool abort_on_gc;
239
240/* Number of live and free conses etc. */ 234/* Number of live and free conses etc. */
241 235
242static EMACS_INT total_conses, total_markers, total_symbols, total_buffers; 236static EMACS_INT total_conses, total_markers, total_symbols, total_buffers;
@@ -5675,9 +5669,6 @@ garbage_collect_1 (void *end)
5675 Lisp_Object retval = Qnil; 5669 Lisp_Object retval = Qnil;
5676 size_t tot_before = 0; 5670 size_t tot_before = 0;
5677 5671
5678 if (abort_on_gc)
5679 emacs_abort ();
5680
5681 /* Can't GC if pure storage overflowed because we can't determine 5672 /* Can't GC if pure storage overflowed because we can't determine
5682 if something is a pure object or not. */ 5673 if something is a pure object or not. */
5683 if (pure_bytes_used_before_overflow) 5674 if (pure_bytes_used_before_overflow)